powerpc/prom: fix early DEBUG messages

[ 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>

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index f830562974417bfd0f338766b59a6ffd7a09a176..d96b2841509047a307749c6b8c7955fca9899d67 100644 (file)
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -128,7 +128,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");
@@ -662,7 +662,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))
@@ -722,7 +722,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? */