From 8ccca9291f3345c7a91a0e73d705f02031583ed7 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 2 May 2011 14:18:52 +0200
Subject: [PATCH] --- yaml --- r: 245700 b: refs/heads/master c:
 797390d8554b1e07aabea37d0140933b0412dba0 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/kernel/apic/numaq_32.c | 2 --
 trunk/arch/x86/mm/init_32.c           | 1 +
 trunk/arch/x86/mm/numa_32.c           | 1 -
 trunk/arch/x86/mm/srat_32.c           | 8 +-------
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index de8bd7ba1ec3..208352be050d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84914ed0ec6787d38e84b510f92ad4ca3a572fd8
+refs/heads/master: 797390d8554b1e07aabea37d0140933b0412dba0
diff --git a/trunk/arch/x86/kernel/apic/numaq_32.c b/trunk/arch/x86/kernel/apic/numaq_32.c
index 0aced70815f0..41b8b29d36f5 100644
--- a/trunk/arch/x86/kernel/apic/numaq_32.c
+++ b/trunk/arch/x86/kernel/apic/numaq_32.c
@@ -91,8 +91,6 @@ static inline void numaq_register_node(int node, struct sys_cfg_data *scd)
 
 	memblock_x86_register_active_regions(node, node_start_pfn[node],
 						node_end_pfn[node]);
-
-	memory_present(node, node_start_pfn[node], node_end_pfn[node]);
 }
 
 /*
diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c
index 80088f994193..2cde0a34bed6 100644
--- a/trunk/arch/x86/mm/init_32.c
+++ b/trunk/arch/x86/mm/init_32.c
@@ -716,6 +716,7 @@ void __init paging_init(void)
 	 * NOTE: at this point the bootmem allocator is fully available.
 	 */
 	olpc_dt_build_devicetree();
+	sparse_memory_present_with_active_regions(MAX_NUMNODES);
 	sparse_init();
 	zone_sizes_init();
 }
diff --git a/trunk/arch/x86/mm/numa_32.c b/trunk/arch/x86/mm/numa_32.c
index e0d9716ab382..f847fa1e02dc 100644
--- a/trunk/arch/x86/mm/numa_32.c
+++ b/trunk/arch/x86/mm/numa_32.c
@@ -119,7 +119,6 @@ int __init get_memcfg_numa_flat(void)
 	node_start_pfn[0] = 0;
 	node_end_pfn[0] = max_pfn;
 	memblock_x86_register_active_regions(0, 0, max_pfn);
-	memory_present(0, 0, max_pfn);
 
         /* Indicate there is one node available. */
 	nodes_clear(node_online_map);
diff --git a/trunk/arch/x86/mm/srat_32.c b/trunk/arch/x86/mm/srat_32.c
index ae20046a9e98..6b9bfd78bc35 100644
--- a/trunk/arch/x86/mm/srat_32.c
+++ b/trunk/arch/x86/mm/srat_32.c
@@ -209,7 +209,7 @@ static __init int node_read_chunk(int nid, struct node_memory_chunk_s *memory_ch
 
 int __init get_memcfg_from_srat(void)
 {
-	int i, j, nid;
+	int i, j;
 
 	if (srat_disabled())
 		goto out_fail;
@@ -273,12 +273,6 @@ int __init get_memcfg_from_srat(void)
 	/* for out of order entries in SRAT */
 	sort_node_map();
 
-	for_each_online_node(nid) {
-		unsigned long start = node_start_pfn[nid];
-		unsigned long end = min(node_end_pfn[nid], max_pfn);
-
-		memory_present(nid, start, end);
-	}
 	return 1;
 out_fail:
 	printk(KERN_DEBUG "failed to get NUMA memory information from SRAT"