---

yaml --- r: 234897 b: refs/heads/master c: 51b361b h: refs/heads/master i: 234895: 29063e0 v: v3
git-mirror · Mar 4, 2011 · 9297a5c · 9297a5c
1 parent a742119
commit 9297a5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f89112502805c1f6a6955f90ad158e538edb319d
+refs/heads/master: 51b361b4009f4e19ae68d2bcbb35e254e91b6054
diff --git a/trunk/arch/x86/mm/numa_emulation.c b/trunk/arch/x86/mm/numa_emulation.c
@@ -417,9 +417,7 @@ void __cpuinit numa_add_cpu(int cpu)
 {
 	int physnid, nid;
 
-	nid = numa_cpu_node(cpu);
-	if (nid == NUMA_NO_NODE)
-		nid = early_cpu_to_node(cpu);
+	nid = early_cpu_to_node(cpu);
 	BUG_ON(nid == NUMA_NO_NODE || !node_online(nid));
 
 	physnid = emu_nid_to_phys[nid];