From bb47d2d4961c19eb7a12786cab69922162aca097 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 8 Jul 2009 09:50:19 -0700
Subject: [PATCH] --- yaml --- r: 155111 b: refs/heads/master c:
 44b572809581d5a10dbe35aa6bf689f32b9c5ad6 h: refs/heads/master i:   155109:
 cb84eeabd4cd4900deaedd31e16f79531091c544   155107:
 2ab229f90fe233162d8d93f92771221b5481080f   155103:
 fe24ec152f3e28388e3c504826b5999b5a085cdd v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86/mm/init_64.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index de384ebe3cec..fd1d60a43ec1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad361c9884e809340f6daca80d56a9e9c871690a
+refs/heads/master: 44b572809581d5a10dbe35aa6bf689f32b9c5ad6
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index b177652251a4..6176fe8f29e0 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/arch/x86/mm/init_64.c
@@ -598,8 +598,15 @@ void __init paging_init(void)
 
 	sparse_memory_present_with_active_regions(MAX_NUMNODES);
 	sparse_init();
-	/* clear the default setting with node 0 */
-	nodes_clear(node_states[N_NORMAL_MEMORY]);
+
+	/*
+	 * clear the default setting with node 0
+	 * note: don't use nodes_clear here, that is really clearing when
+	 *	 numa support is not compiled in, and later node_set_state
+	 *	 will not set it back.
+	 */
+	node_clear_state(0, N_NORMAL_MEMORY);
+
 	free_area_init_nodes(max_zone_pfns);
 }