diff options
| author | Yinghai Lu | 2008-06-23 12:06:14 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-08 12:50:21 +0200 |
| commit | 346cafecdeb17e1a0457a9e7eca239ef467b678c (patch) | |
| tree | a060f99a7389c583d851dc6a7ace2a1e54ccf2ca /arch/x86/mm/init_64.c | |
| parent | x86: clean up using max_low_pfn on 32-bit (diff) | |
| download | kernel-qcow2-linux-346cafecdeb17e1a0457a9e7eca239ef467b678c.tar.gz kernel-qcow2-linux-346cafecdeb17e1a0457a9e7eca239ef467b678c.tar.xz kernel-qcow2-linux-346cafecdeb17e1a0457a9e7eca239ef467b678c.zip | |
x86: clean up min_low_pfn
for 32bit
we already had early_res support, so don't need to track min_low_pfn.
keep it to 0 always.
also use init_bootmem_node instead of init_bootmem, so don't touch
min_low_pfn.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_64.c')
| -rw-r--r-- | arch/x86/mm/init_64.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 99a091ee5a6a..955dbc8abf6a 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -620,7 +620,9 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn) PAGE_SIZE); if (bootmap == -1L) panic("Cannot find bootmem map of size %ld\n", bootmap_size); - bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn); + /* don't touch min_low_pfn */ + bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap >> PAGE_SHIFT, + 0, end_pfn); e820_register_active_regions(0, start_pfn, end_pfn); free_bootmem_with_active_regions(0, end_pfn); early_res_to_bootmem(0, end_pfn<<PAGE_SHIFT); |