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>

3 files changed, 5 insertions, 12 deletions

diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index de9c5ee77d07..6f40cb560ea9 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -614,7 +614,6 @@ void __init setup_bootmem_allocator(void)
          */
         find_smp_config();
 #endif
-        numa_kva_reserve();
         reserve_crashkernel();
 
         reserve_ibft_region();
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)
         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;
diff --git a/include/asm-x86/mmzone_32.h b/include/asm-x86/mmzone_32.h
index cb2cad0b65a7..faef751181b7 100644
--- a/include/asm-x86/mmzone_32.h
+++ b/include/asm-x86/mmzone_32.h
@@ -38,16 +38,12 @@ static inline void get_memcfg_numa(void)
 }
 
 extern int early_pfn_to_nid(unsigned long pfn);
-extern void numa_kva_reserve(void);
 
 #else /* !CONFIG_NUMA */
 
 #define get_memcfg_numa get_memcfg_numa_flat
 #define get_zholes_size(n) (0)
 
-static inline void numa_kva_reserve(void)
-{
-}
 #endif /* CONFIG_NUMA */
 
 #ifdef CONFIG_DISCONTIGMEM