1 files changed, 5 insertions, 5 deletions

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index fe758cedb93f..4181ec715f88 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -124,12 +124,12 @@ static void __init move_device_tree(void)
         size = fdt_totalsize(initial_boot_params);
 
         if ((memory_limit && (start + size) > PHYSICAL_START + memory_limit) ||
-                        overlaps_crashkernel(start, size) ||
-                        overlaps_initrd(start, size)) {
+            !memblock_is_memory(start + size - 1) ||
+            overlaps_crashkernel(start, size) || overlaps_initrd(start, size)) {
                 p = __va(memblock_phys_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? */