From f34361b7596b83c64298eb6e0b28992a6e3e6325 Mon Sep 17 00:00:00 2001
From: Steffen Persvold <sp@numascale.com>
Date: Tue, 6 Dec 2011 01:10:31 +0100
Subject: [PATCH] --- yaml --- r: 277433 b: refs/heads/master c:
 e4a02b4a951a7adf9d982b11c64686570c29fbe7 h: refs/heads/master i:   277431:
 89fe91ab09fa815f916b9f603e299c0ce359dc1a v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/kernel/cpu/common.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f7d12511520d..f5505bb484a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44b111b519160e33fdc41eadb39af86a24707edf
+refs/heads/master: e4a02b4a951a7adf9d982b11c64686570c29fbe7
diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
index ad4da45effb9..a70bd5b96b9e 100644
--- a/trunk/arch/x86/kernel/cpu/common.c
+++ b/trunk/arch/x86/kernel/cpu/common.c
@@ -1146,7 +1146,9 @@ static void dbg_restore_debug_regs(void)
  */
 void __cpuinit x86_default_fixup_cpu_id(struct cpuinfo_x86 *c, int node)
 {
+#ifdef CONFIG_NUMA
 	pr_err("NUMA core number %d differs from configured core number %d\n", node, c->phys_proc_id);
+#endif
 }
 
 /*