x86, 32-bit: change propagate_e820_map() back to find_max_pfn()

we don't need to call memory_present that early.
numa and sparse will call memory_present later and might
even fail, it will call memory_present for the full range.

also for sparse it will call alloc_bootmem ... before we set up bootmem.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86/kernel/e820_32.c b/arch/x86/kernel/e820_32.c
index db760d4706a..0c025d04fc2 100644
--- a/arch/x86/kernel/e820_32.c
+++ b/arch/x86/kernel/e820_32.c
@@ -210,7 +210,7 @@ void __init init_iomem_resources(struct resource *code_resource,
 /*
  * Find the highest page frame number we have available
  */
-void __init propagate_e820_map(void)
+void __init find_max_pfn(void)
 {
         int i;
 
@@ -227,7 +227,6 @@ void __init propagate_e820_map(void)
                         continue;
                 if (end > max_pfn)
                         max_pfn = end;
-                memory_present(0, start, end);
         }
 }
 
@@ -361,7 +360,7 @@ static int __init parse_memmap(char *arg)
                  * size before original memory map is
                  * reset.
                  */
-                propagate_e820_map();
+                find_max_pfn();
                 saved_max_pfn = max_pfn;
 #endif
                 e820.nr_map = 0;