lkml.org 
[lkml]   [2011]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH tip] Fix build failure x86_default_fixup_cpu_id() with !CONFIG_SMP
Hi,

tip (a4a7e7e29333) build fails, when compiled with !CONFIG_SMP.
I have only build tested the patch.

x86: Fix x86_default_fixup_cpu_id() build failure with !CONFIG_SMP

arch/x86/kernel/cpu/common.c: In function 'x86_default_fixup_cpu_id':
arch/x86/kernel/cpu/common.c:1149: error: 'struct cpuinfo_x86' has no member named 'phys_proc_id'
make[3]: *** [arch/x86/kernel/cpu/common.o] Error 1

the code was introduced by commit 64be4c1c24. This patch
introduced #ifdef to guard !SMP case.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
arch/x86/kernel/cpu/common.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index ad4da45..1154528 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/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_SMP
pr_err("NUMA core number %d differs from configured core number %d\n", node, c->phys_proc_id);
+#endif
}

/*


\
 
 \ /
  Last update: 2011-12-06 11:51    [W:0.462 / U:0.424 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site