4 files changed, 8 insertions, 8 deletions

diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
index f612798e1c93..2b2420a49884 100644
--- a/arch/powerpc/include/asm/system.h
+++ b/arch/powerpc/include/asm/system.h
@@ -212,7 +212,7 @@ extern struct task_struct *_switch(struct thread_struct *prev,
 extern unsigned int rtas_data;
 extern int mem_init_done;       /* set on boot once kmalloc can be called */
 extern int init_bootmem_done;   /* set on !NUMA once bootmem is available */
-extern unsigned long memory_limit;
+extern phys_addr_t memory_limit;
 extern unsigned long klimit;
 
 extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index d59e2b1bdcba..bb3d893a8353 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -125,8 +125,8 @@ void __init reserve_crashkernel(void)
         /* Crash kernel trumps memory limit */
         if (memory_limit && memory_limit <= crashk_res.end) {
                 memory_limit = crashk_res.end + 1;
-                printk("Adjusted memory limit for crashkernel, now 0x%lx\n",
-                                memory_limit);
+                printk("Adjusted memory limit for crashkernel, now 0x%llx\n",
+                       (unsigned long long)memory_limit);
         }
 
         printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 5ec6a9e23933..ce01ff2474da 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -426,7 +426,7 @@ static int __init early_parse_mem(char *p)
                 return 1;
 
         memory_limit = PAGE_ALIGN(memparse(p, &p));
-        DBG("memory limit = 0x%lx\n", memory_limit);
+        DBG("memory limit = 0x%llx\n", (unsigned long long)memory_limit);
 
         return 0;
 }
@@ -1160,7 +1160,7 @@ static inline void __init phyp_dump_reserve_mem(void) {}
 
 void __init early_init_devtree(void *params)
 {
-        unsigned long limit;
+        phys_addr_t limit;
 
         DBG(" -> early_init_devtree(%p)\n", params);
 
@@ -1204,7 +1204,7 @@ void __init early_init_devtree(void *params)
 
         limit = memory_limit;
         if (! limit) {
-                unsigned long memsize;
+                phys_addr_t memsize;
 
                 /* Ensure that total memory size is page-aligned, because
                  * otherwise mark_bootmem() gets upset. */
@@ -1218,7 +1218,7 @@ void __init early_init_devtree(void *params)
         lmb_analyze();
         lmb_dump_all();
 
-        DBG("Phys. mem: %lx\n", lmb_phys_mem_size());
+        DBG("Phys. mem: %llx\n", lmb_phys_mem_size());
 
         /* We may need to relocate the flat tree, do it now.
          * FIXME .. and the initrd too? */
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index f668fa9ba804..d0602a76bf7f 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -57,7 +57,7 @@
 
 int init_bootmem_done;
 int mem_init_done;
-unsigned long memory_limit;
+phys_addr_t memory_limit;
 
 #ifdef CONFIG_HIGHMEM
 pte_t *kmap_pte;