kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[MIPS] Replace 40c7869b69 kludge

Browse source 
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Atsushi Nemoto 2008-01-08 00:41:13 +09:00 committed by Ralf Baechle
parent 778bc145fe
commit e452e94e21
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/mips/kernel/setup.c
View file

@ -269,7 +269,7 @@ static void __init bootmem_init(void)
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 mapstart = ~0UL;
unsigned long bootmap_size; unsigned long bootmap_size;
int i; int i;
@ -344,7 +344,6 @@ static void __init bootmem_init(void)
min_low_pfn, max_low_pfn); min_low_pfn, max_low_pfn);
init_begin = PFN_UP(__pa_symbol(&__init_begin));
for (i = 0; i < boot_mem_map.nr_map; i++) { for (i = 0; i < boot_mem_map.nr_map; i++) {
unsigned long start, end; unsigned long start, end;
@ -352,8 +351,8 @@ static void __init bootmem_init(void)
end = PFN_DOWN(boot_mem_map.map[i].addr end = PFN_DOWN(boot_mem_map.map[i].addr
+ boot_mem_map.map[i].size); + boot_mem_map.map[i].size);
if (start <= init_begin) if (start <= min_low_pfn)
start = init_begin; start = min_low_pfn;
if (start >= end) if (start >= end)
continue; continue;

2
arch/mips/mips-boards/generic/memory.c
View file

@ -169,7 +169,6 @@ void __init prom_meminit(void)
void __init prom_free_prom_memory(void) void __init prom_free_prom_memory(void)
{ {
#if 0 /* for now ... */
unsigned long addr; unsigned long addr;
int i; int i;
@ -181,5 +180,4 @@ void __init prom_free_prom_memory(void)
free_init_pages("prom memory", free_init_pages("prom memory",
addr, addr + boot_mem_map.map[i].size); addr, addr + boot_mem_map.map[i].size);
} }
#endif
} }