diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-05-29 19:58:37 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-31 07:55:53 (GMT) |
| commit | a5481280b29b6a3db912ec100498bd31eaa6d2db (patch) | |
| tree | 97f931a6cbd0a7afd184fde3d17984a78b5c6c88 /arch/x86/mm/discontig_32.c | |
| parent | 163872950dc856fd23849c27f60049feaac49ae6 (diff) | |
| download | linux-a5481280b29b6a3db912ec100498bd31eaa6d2db.tar.xz | |
x86: extend e820 early_res support 32bit -fix #5
reserve early numa kva, so it will not clash with new RAMDISK
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/discontig_32.c')
| -rw-r--r-- | arch/x86/mm/discontig_32.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index 4774972..55fdbab 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c @@ -357,6 +357,11 @@ unsigned long __init setup_memory(void) printk("kva_start_pfn ~ %ld find_max_low_pfn() ~ %ld\n", kva_start_pfn, max_low_pfn); printk("max_pfn = %ld\n", max_pfn); + + /* avoid clash with initrd */ + reserve_early(kva_start_pfn<<PAGE_SHIFT, + (kva_start_pfn + kva_pages)<<PAGE_SHIFT, + "KVA PG"); #ifdef CONFIG_HIGHMEM highstart_pfn = highend_pfn = max_pfn; if (max_pfn > system_max_low_pfn) @@ -392,13 +397,6 @@ unsigned long __init setup_memory(void) return max_low_pfn; } -void __init numa_kva_reserve(void) -{ - if (kva_pages) - reserve_bootmem(PFN_PHYS(kva_start_pfn), PFN_PHYS(kva_pages), - BOOTMEM_DEFAULT); -} - void __init zone_sizes_init(void) { int nid; |