---

yaml --- r: 155111 b: refs/heads/master c: 44b5728 h: refs/heads/master i: 155109: cb84eea 155107: 2ab229f 155103: fe24ec1 v: v3
git-mirror · Jul 8, 2009 · bb47d2d · bb47d2d
1 parent 059789a
commit bb47d2d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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);
 }