2 files changed, 3 insertions, 6 deletions

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 7f6ddcb5d485..f8a535afce39 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -269,7 +269,7 @@ static void __init bootmem_init(void)
 
 static void __init bootmem_init(void)
 {
-        unsigned long init_begin, reserved_end;
+        unsigned long reserved_end;
         unsigned long mapstart = ~0UL;
         unsigned long bootmap_size;
         int i;
@@ -344,7 +344,6 @@ static void __init bootmem_init(void)
                                          min_low_pfn, max_low_pfn);
 
 
-        init_begin = PFN_UP(__pa_symbol(&__init_begin));
         for (i = 0; i < boot_mem_map.nr_map; i++) {
                 unsigned long start, end;
 
@@ -352,8 +351,8 @@ static void __init bootmem_init(void)
                 end = PFN_DOWN(boot_mem_map.map[i].addr
                                 + boot_mem_map.map[i].size);
 
-                if (start <= init_begin)
-                        start = init_begin;
+                if (start <= min_low_pfn)
+                        start = min_low_pfn;
                 if (start >= end)
                         continue;
 
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c
index 2c5c27c8e86d..dc272c188233 100644
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mips-boards/generic/memory.c
@@ -169,7 +169,6 @@ void __init prom_meminit(void)
 
 void __init prom_free_prom_memory(void)
 {
-#if 0 /* for now ...  */
         unsigned long addr;
         int i;
 
@@ -181,5 +180,4 @@ void __init prom_free_prom_memory(void)
                 free_init_pages("prom memory",
                                 addr, addr + boot_mem_map.map[i].size);
         }
-#endif
 }