[MIPS] Replace 40c7869b693b18412491fdcff64682215b739f9e kludge

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by Atsushi Nemoto and committed by Ralf Baechle e452e94e 778bc145

+3 -6
+3 -4
arch/mips/kernel/setup.c
··· 269 270 static void __init bootmem_init(void) 271 { 272 - unsigned long init_begin, reserved_end; 273 unsigned long mapstart = ~0UL; 274 unsigned long bootmap_size; 275 int i; ··· 344 min_low_pfn, max_low_pfn); 345 346 347 - init_begin = PFN_UP(__pa_symbol(&__init_begin)); 348 for (i = 0; i < boot_mem_map.nr_map; i++) { 349 unsigned long start, end; 350 ··· 351 end = PFN_DOWN(boot_mem_map.map[i].addr 352 + boot_mem_map.map[i].size); 353 354 - if (start <= init_begin) 355 - start = init_begin; 356 if (start >= end) 357 continue; 358
··· 269 270 static void __init bootmem_init(void) 271 { 272 + unsigned long reserved_end; 273 unsigned long mapstart = ~0UL; 274 unsigned long bootmap_size; 275 int i; ··· 344 min_low_pfn, max_low_pfn); 345 346 347 for (i = 0; i < boot_mem_map.nr_map; i++) { 348 unsigned long start, end; 349 ··· 352 end = PFN_DOWN(boot_mem_map.map[i].addr 353 + boot_mem_map.map[i].size); 354 355 + if (start <= min_low_pfn) 356 + start = min_low_pfn; 357 if (start >= end) 358 continue; 359
-2
arch/mips/mips-boards/generic/memory.c
··· 169 170 void __init prom_free_prom_memory(void) 171 { 172 - #if 0 /* for now ... */ 173 unsigned long addr; 174 int i; 175 ··· 180 free_init_pages("prom memory", 181 addr, addr + boot_mem_map.map[i].size); 182 } 183 - #endif 184 }
··· 169 170 void __init prom_free_prom_memory(void) 171 { 172 unsigned long addr; 173 int i; 174 ··· 181 free_init_pages("prom memory", 182 addr, addr + boot_mem_map.map[i].size); 183 } 184 }