Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97f274ef authored by Christophe Leroy's avatar Christophe Leroy Committed by Greg Kroah-Hartman
Browse files

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: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 94a5e819

arch/powerpc/kernel/prom.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -128,7 +128,7 @@ static void __init move_device_tree(void) 
		p = __va(memblock_alloc(size, PAGE_SIZE));

		p = __va(memblock_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");
@@ -651,7 +651,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))
@@ -711,7 +711,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? */