---

yaml --- r: 365423 b: refs/heads/master c: d2ad351 h: refs/heads/master i: 365421: 2275b9c 365419: 28c1a08 365415: 1df9ffb 365407: a7bd890 v: v3
git-mirror · Apr 29, 2013 · 28ed105 · 28ed105
1 parent 0198faa
commit 28ed105
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9872caf07c1c774034b8bddde7d4a3a7f4a6484
+refs/heads/master: d2ad351e36e333c6e1a474b2c5d635828f53a173
diff --git a/trunk/arch/x86/mm/numa.c b/trunk/arch/x86/mm/numa.c
@@ -114,14 +114,11 @@ void numa_clear_node(int cpu)
  */
 void __init setup_node_to_cpumask_map(void)
 {
-	unsigned int node, num = 0;
+	unsigned int node;
 
 	/* setup nr_node_ids if not done yet */
-	if (nr_node_ids == MAX_NUMNODES) {
-		for_each_node_mask(node, node_possible_map)
-			num = node;
-		nr_node_ids = num + 1;
-	}
+	if (nr_node_ids == MAX_NUMNODES)
+		setup_nr_node_ids();
 
 	/* allocate the map */
 	for (node = 0; node < nr_node_ids; node++)