From 9297a5c499ef8bf62f06324725e6c6113a40b243 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Fri, 4 Mar 2011 14:49:28 +0100
Subject: [PATCH] --- yaml --- r: 234897 b: refs/heads/master c:
 51b361b4009f4e19ae68d2bcbb35e254e91b6054 h: refs/heads/master i:   234895:
 29063e00d63dde6137698613832b9e29de304210 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/mm/numa_emulation.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 79304ce4ced5..d6636840ef8a 100644
--- 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
index aeecea93820f..75b31dc0f329 100644
--- 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];