]> asedeno.scripts.mit.edu Git - linux.git/commit
powerpc32/booke: consistently return phys_addr_t in __pa()
authorBai Yingjie <byj.tea@gmail.com>
Mon, 6 Jan 2020 04:29:53 +0000 (12:29 +0800)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 7 Jan 2020 11:05:51 +0000 (22:05 +1100)
commit6ad4afc97bc6c5cca9786030492ddfab871ce79e
tree3013f3e823c879f96265858f1f0dd4af6b4c8578
parent552aa086944a9aeabd599892007c2c7faedb894e
powerpc32/booke: consistently return phys_addr_t in __pa()

When CONFIG_RELOCATABLE=y is set, VIRT_PHYS_OFFSET is a 64bit variable,
thus __pa() returns as 64bit value.
But when CONFIG_RELOCATABLE=n, __pa() returns 32bit value.

When CONFIG_PHYS_64BIT is set, __pa() should consistently return as
64bit value irrelevant to CONFIG_RELOCATABLE.
So we'd make __pa() consistently return phys_addr_t, which is 64bit
when CONFIG_PHYS_64BIT is set.

Signed-off-by: Bai Yingjie <byj.tea@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200106042957.26494-1-yingjie_bai@126.com
arch/powerpc/include/asm/page.h