linux-kernel - [PATCH tip] Fix build failure x86_default_fixup_cpu_id() with !CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20111206104755.GA8567@linux.vnet.ibm.com>
Date:	Tue, 6 Dec 2011 16:17:55 +0530
From:	Kamalesh Babulal <kamalesh@...ux.vnet.ibm.com>
To:	daniel@...ascale-asia.com
Cc:	mingo@...e.hu, sp@...ascale.com, jbarnes@...tuousgeek.org,
	linux-kernel@...r.kernel.org
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@...ux.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
 }
 
 /*

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/