diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2010-02-10 01:20:15 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 17:47:18 -0800 |
| commit | 1842f90cc98625d4d9bf8f8b927f17705ceb4e9c (patch) | |
| tree | 12a120d130aef8d12010d1b3732af1387bac751d /arch/x86/mm/init_64.c | |
| parent | 79c601695870ca2a9c0ba9949a97d2be78ec07b2 (diff) | |
| download | kernel_samsung_tuna-1842f90cc98625d4d9bf8f8b927f17705ceb4e9c.zip kernel_samsung_tuna-1842f90cc98625d4d9bf8f8b927f17705ceb4e9c.tar.gz kernel_samsung_tuna-1842f90cc98625d4d9bf8f8b927f17705ceb4e9c.tar.bz2 | |
x86: Call early_res_to_bootmem one time
Simplify setup_node_mem: don't use bootmem from other node, instead
just find_e820_area in early_node_mem.
This keeps the boundary between early_res and boot mem more clear, and
lets us only call early_res_to_bootmem() one time instead of for all
nodes.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1265793639-15071-12-git-send-email-yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/mm/init_64.c')
| -rw-r--r-- | arch/x86/mm/init_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 69ddfbd..a15abaa 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -579,13 +579,12 @@ 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); + reserve_early(bootmap, bootmap + bootmap_size, "BOOTMAP"); /* 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); - reserve_bootmem(bootmap, bootmap_size, BOOTMEM_DEFAULT); } #endif |