diff options
| author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2008-01-08 00:41:13 +0900 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-01-11 17:05:42 +0000 |
| commit | e452e94e21e8f4a3c2ff045b301ca21c1f6d03bf (patch) | |
| tree | 5785060011dbe098753f30d303d2fe2ceb298e69 | |
| parent | 778bc145feb68f365339d6b5c9e35af2a86fb233 (diff) | |
| download | kernel_samsung_aries-e452e94e21e8f4a3c2ff045b301ca21c1f6d03bf.zip kernel_samsung_aries-e452e94e21e8f4a3c2ff045b301ca21c1f6d03bf.tar.gz kernel_samsung_aries-e452e94e21e8f4a3c2ff045b301ca21c1f6d03bf.tar.bz2 | |
[MIPS] Replace 40c7869b693b18412491fdcff64682215b739f9e kludge
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/kernel/setup.c | 7 | ||||
| -rw-r--r-- | arch/mips/mips-boards/generic/memory.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 7f6ddcb..f8a535a 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 2c5c27c..dc272c1 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 } |