mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
To: daniel@numascale-asia.com
Cc: mingo@elte.hu, sp@numascale.com, jbarnes@virtuousgeek.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH tip] Fix build failure x86_default_fixup_cpu_id() with !CONFIG_SMP
Date: Tue, 6 Dec 2011 16:17:55 +0530	[thread overview]
Message-ID: <20111206104755.GA8567@linux.vnet.ibm.com> (raw)

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
 }
 
 /*


             reply	other threads:[~2011-12-06 10:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-06 10:47 Kamalesh Babulal [this message]
2011-12-06 11:37 ` Srivatsa S. Bhat
2011-12-06 11:44   ` Steffen Persvold
2011-12-06 16:21     ` Kamalesh Babulal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111206104755.GA8567@linux.vnet.ibm.com \
    --to=kamalesh@linux.vnet.ibm.com \
    --cc=daniel@numascale-asia.com \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=sp@numascale.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome