1 files changed, 13 insertions, 14 deletions

diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 977cb1ee5e72..47325f23c51f 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -30,6 +30,7 @@
 #include <linux/highmem.h>
 #include <linux/initrd.h>
 #include <linux/pagemap.h>
+#include <linux/lmb.h>
 
 #include <asm/pgalloc.h>
 #include <asm/prom.h>
@@ -41,7 +42,6 @@
 #include <asm/machdep.h>
 #include <asm/btext.h>
 #include <asm/tlb.h>
-#include <asm/lmb.h>
 #include <asm/sections.h>
 
 #include "mmu_decl.h"
@@ -59,8 +59,8 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 unsigned long total_memory;
 unsigned long total_lowmem;
 
-unsigned long ppc_memstart;
-unsigned long ppc_memoffset = PAGE_OFFSET;
+phys_addr_t memstart_addr;
+phys_addr_t lowmem_end_addr;
 
 int boot_mapsize;
 #ifdef CONFIG_PPC_PMAC
@@ -95,10 +95,10 @@ int __map_without_ltlbs;
 unsigned long __max_low_memory = MAX_LOW_MEM;
 
 /*
- * limit of what is accessible with initial MMU setup -
+ * address of the limit of what is accessible with initial MMU setup -
  * 256MB usually, but only 16MB on 601.
  */
-unsigned long __initial_memory_limit = 0x10000000;
+phys_addr_t __initial_memory_limit_addr = (phys_addr_t)0x10000000;
 
 /*
  * Check for command-line options that affect what MMU_init will do.
@@ -131,10 +131,10 @@ void __init MMU_init(void)
 
         /* 601 can only access 16MB at the moment */
         if (PVR_VER(mfspr(SPRN_PVR)) == 1)
-                __initial_memory_limit = 0x01000000;
+                __initial_memory_limit_addr = 0x01000000;
         /* 8xx can only access 8MB at the moment */
         if (PVR_VER(mfspr(SPRN_PVR)) == 0x50)
-                __initial_memory_limit = 0x00800000;
+                __initial_memory_limit_addr = 0x00800000;
 
         /* parse args from command line */
         MMU_setup();
@@ -145,8 +145,8 @@ void __init MMU_init(void)
                 printk(KERN_WARNING "Only using first contiguous memory region");
         }
 
-        total_memory = lmb_end_of_DRAM();
-        total_lowmem = total_memory;
+        total_lowmem = total_memory = lmb_end_of_DRAM() - memstart_addr;
+        lowmem_end_addr = memstart_addr + total_lowmem;
 
 #ifdef CONFIG_FSL_BOOKE
         /* Freescale Book-E parts expect lowmem to be mapped by fixed TLB
@@ -157,9 +157,10 @@ void __init MMU_init(void)
 
         if (total_lowmem > __max_low_memory) {
                 total_lowmem = __max_low_memory;
+                lowmem_end_addr = memstart_addr + total_lowmem;
 #ifndef CONFIG_HIGHMEM
                 total_memory = total_lowmem;
-                lmb_enforce_memory_limit(total_lowmem);
+                lmb_enforce_memory_limit(lowmem_end_addr);
                 lmb_analyze();
 #endif /* CONFIG_HIGHMEM */
         }
@@ -184,8 +185,6 @@ void __init MMU_init(void)
         /* Map in I/O resources */
         if (ppc_md.progress)
                 ppc_md.progress("MMU:setio", 0x302);
-        if (ppc_md.setup_io_mappings)
-                ppc_md.setup_io_mappings();
 
         /* Initialize the context management stuff */
         mmu_context_init();
@@ -208,7 +207,7 @@ void __init *early_get_page(void)
                 p = alloc_bootmem_pages(PAGE_SIZE);
         } else {
                 p = __va(lmb_alloc_base(PAGE_SIZE, PAGE_SIZE,
-                                        __initial_memory_limit));
+                                        __initial_memory_limit_addr));
         }
         return p;
 }
@@ -276,7 +275,7 @@ static int __init setup_kcore(void)
 
                 kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
                 if (!kcore_mem)
-                        panic("%s: kmalloc failed\n", __FUNCTION__);
+                        panic("%s: kmalloc failed\n", __func__);
 
                 /* must stay under 32 bits */
                 if ( 0xfffffffful - (unsigned long)__va(base) < size) {