| From e266e3f1433fafd8f5d2882094c009f8592507f0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 14 Dec 2018 10:27:47 +0000 |
| Subject: powerpc/prom: fix early DEBUG messages |
| |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| |
| [ Upstream commit b18f0ae92b0a1db565c3e505fa87b6971ad3b641 ] |
| |
| This patch fixes early DEBUG messages in prom.c: |
| - Use %px instead of %p to see the addresses |
| - Cast memblock_phys_mem_size() with (unsigned long long) to |
| avoid build failure when phys_addr_t is not 64 bits. |
| |
| Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/kernel/prom.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c |
| index c4d7078e5295f..8e88f78e57dba 100644 |
| --- a/arch/powerpc/kernel/prom.c |
| +++ b/arch/powerpc/kernel/prom.c |
| @@ -129,7 +129,7 @@ static void __init move_device_tree(void) |
| p = __va(memblock_alloc(size, PAGE_SIZE)); |
| memcpy(p, initial_boot_params, size); |
| initial_boot_params = p; |
| - DBG("Moved device tree to 0x%p\n", p); |
| + DBG("Moved device tree to 0x%px\n", p); |
| } |
| |
| DBG("<- move_device_tree\n"); |
| @@ -689,7 +689,7 @@ void __init early_init_devtree(void *params) |
| { |
| phys_addr_t limit; |
| |
| - DBG(" -> early_init_devtree(%p)\n", params); |
| + DBG(" -> early_init_devtree(%px)\n", params); |
| |
| /* Too early to BUG_ON(), do it by hand */ |
| if (!early_init_dt_verify(params)) |
| @@ -749,7 +749,7 @@ void __init early_init_devtree(void *params) |
| memblock_allow_resize(); |
| memblock_dump_all(); |
| |
| - DBG("Phys. mem: %llx\n", memblock_phys_mem_size()); |
| + DBG("Phys. mem: %llx\n", (unsigned long long)memblock_phys_mem_size()); |
| |
| /* We may need to relocate the flat tree, do it now. |
| * FIXME .. and the initrd too? */ |
| -- |
| 2.20.1 |
| |
