Commit b18f0ae9 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

powerpc/prom: fix early DEBUG messages

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: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e1e71e20
...@@ -129,7 +129,7 @@ static void __init move_device_tree(void) ...@@ -129,7 +129,7 @@ static void __init move_device_tree(void)
p = __va(memblock_phys_alloc(size, PAGE_SIZE)); p = __va(memblock_phys_alloc(size, PAGE_SIZE));
memcpy(p, initial_boot_params, size); memcpy(p, initial_boot_params, size);
initial_boot_params = p; 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"); DBG("<- move_device_tree\n");
...@@ -689,7 +689,7 @@ void __init early_init_devtree(void *params) ...@@ -689,7 +689,7 @@ void __init early_init_devtree(void *params)
{ {
phys_addr_t limit; 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 */ /* Too early to BUG_ON(), do it by hand */
if (!early_init_dt_verify(params)) if (!early_init_dt_verify(params))
...@@ -749,7 +749,7 @@ void __init early_init_devtree(void *params) ...@@ -749,7 +749,7 @@ void __init early_init_devtree(void *params)
memblock_allow_resize(); memblock_allow_resize();
memblock_dump_all(); 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. /* We may need to relocate the flat tree, do it now.
* FIXME .. and the initrd too? */ * FIXME .. and the initrd too? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment