From 14c88cf2644e1244427e9c0ebae4331b53fa7351 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Tue, 8 Jan 2008 00:41:13 +0900 Subject: [PATCH] --- yaml --- r: 75382 b: refs/heads/master c: e452e94e21e8f4a3c2ff045b301ca21c1f6d03bf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/setup.c | 7 +++---- trunk/arch/mips/mips-boards/generic/memory.c | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index dbfcc589dc34..fdeaee30ec19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 778bc145feb68f365339d6b5c9e35af2a86fb233 +refs/heads/master: e452e94e21e8f4a3c2ff045b301ca21c1f6d03bf diff --git a/trunk/arch/mips/kernel/setup.c b/trunk/arch/mips/kernel/setup.c index 7f6ddcb5d485..f8a535afce39 100644 --- a/trunk/arch/mips/kernel/setup.c +++ b/trunk/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/trunk/arch/mips/mips-boards/generic/memory.c b/trunk/arch/mips/mips-boards/generic/memory.c index 2c5c27c8e86d..dc272c188233 100644 --- a/trunk/arch/mips/mips-boards/generic/memory.c +++ b/trunk/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 }