aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/discontig_32.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-05-29 15:58:37 -0400
committerIngo Molnar <mingo@elte.hu>2008-05-31 03:55:53 -0400
commita5481280b29b6a3db912ec100498bd31eaa6d2db (patch)
tree97f931a6cbd0a7afd184fde3d17984a78b5c6c88 /arch/x86/mm/discontig_32.c
parent163872950dc856fd23849c27f60049feaac49ae6 (diff)
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.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index 47749727907e..55fdbab6b014 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)
357 printk("kva_start_pfn ~ %ld find_max_low_pfn() ~ %ld\n", 357 printk("kva_start_pfn ~ %ld find_max_low_pfn() ~ %ld\n",
358 kva_start_pfn, max_low_pfn); 358 kva_start_pfn, max_low_pfn);
359 printk("max_pfn = %ld\n", max_pfn); 359 printk("max_pfn = %ld\n", max_pfn);
360
361 /* avoid clash with initrd */
362 reserve_early(kva_start_pfn<<PAGE_SHIFT,
363 (kva_start_pfn + kva_pages)<<PAGE_SHIFT,
364 "KVA PG");
360#ifdef CONFIG_HIGHMEM 365#ifdef CONFIG_HIGHMEM
361 highstart_pfn = highend_pfn = max_pfn; 366 highstart_pfn = highend_pfn = max_pfn;
362 if (max_pfn > system_max_low_pfn) 367 if (max_pfn > system_max_low_pfn)
@@ -392,13 +397,6 @@ unsigned long __init setup_memory(void)
392 return max_low_pfn; 397 return max_low_pfn;
393} 398}
394 399
395void __init numa_kva_reserve(void)
396{
397 if (kva_pages)
398 reserve_bootmem(PFN_PHYS(kva_start_pfn), PFN_PHYS(kva_pages),
399 BOOTMEM_DEFAULT);
400}
401
402void __init zone_sizes_init(void) 400void __init zone_sizes_init(void)
403{ 401{
404 int nid; 402 int nid;