From 54de1f668ce698cb008abf69b0e3bbd8b885d2d4 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Sat, 31 May 2008 22:52:47 -0700
Subject: [PATCH] --- yaml --- r: 99722 b: refs/heads/master c:
 0596152388e234efebce464355186ad9e16c8cb6 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/e820_32.c  | 5 ++---
 trunk/arch/x86/kernel/setup_32.c | 4 ++--
 trunk/arch/x86/mm/discontig_32.c | 2 +-
 trunk/include/asm-x86/e820_32.h  | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index cb06f7be26d8..f6d3c0a89e85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b66cd7207387b9b428aaf1988e21dd263c6a4928
+refs/heads/master: 0596152388e234efebce464355186ad9e16c8cb6
diff --git a/trunk/arch/x86/kernel/e820_32.c b/trunk/arch/x86/kernel/e820_32.c
index db760d4706af..0c025d04fc2e 100644
--- a/trunk/arch/x86/kernel/e820_32.c
+++ b/trunk/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;
diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c
index 6f40cb560ea9..29010420458d 100644
--- a/trunk/arch/x86/kernel/setup_32.c
+++ b/trunk/arch/x86/kernel/setup_32.c
@@ -730,10 +730,10 @@ void __init setup_arch(char **cmdline_p)
 		efi_init();
 
 	/* update e820 for memory not covered by WB MTRRs */
-	propagate_e820_map();
+	find_max_pfn();
 	mtrr_bp_init();
 	if (mtrr_trim_uncached_memory(max_pfn))
-		propagate_e820_map();
+		find_max_pfn();
 
 	max_low_pfn = setup_memory();
 
diff --git a/trunk/arch/x86/mm/discontig_32.c b/trunk/arch/x86/mm/discontig_32.c
index 98b099eeab3a..ebbbba338150 100644
--- a/trunk/arch/x86/mm/discontig_32.c
+++ b/trunk/arch/x86/mm/discontig_32.c
@@ -120,7 +120,7 @@ int __init get_memcfg_numa_flat(void)
 	printk("NUMA - single node, flat memory mode\n");
 
 	/* Run the memory configuration and find the top of memory. */
-	propagate_e820_map();
+	find_max_pfn();
 	node_start_pfn[0] = 0;
 	node_end_pfn[0] = max_pfn;
 	memory_present(0, 0, max_pfn);
diff --git a/trunk/include/asm-x86/e820_32.h b/trunk/include/asm-x86/e820_32.h
index 7ace82570a36..00fbc60b9d30 100644
--- a/trunk/include/asm-x86/e820_32.h
+++ b/trunk/include/asm-x86/e820_32.h
@@ -21,7 +21,7 @@
 extern void setup_memory_map(void);
 extern void finish_e820_parsing(void);
 
-extern void propagate_e820_map(void);
+extern void find_max_pfn(void);
 extern void register_bootmem_low_pages(unsigned long max_low_pfn);
 extern void limit_regions(unsigned long long size);
 extern void init_iomem_resources(struct resource *code_resource,