---

yaml --- r: 277433 b: refs/heads/master c: e4a02b4 h: refs/heads/master i: 277431: 89fe91a v: v3
git-mirror · Dec 6, 2011 · f34361b · f34361b
1 parent 129a166
commit f34361b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
     }
     /*
@@ Expand Down @@