From: Steffen Persvold Date: Tue, 6 Dec 2011 00:10:31 +0000 (+0100) Subject: x86: Fix the !CONFIG_NUMA build of the new CPU ID fixup code support X-Git-Tag: upstream/snapshot3+hdmi~8457^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4a02b4a951a7adf9d982b11c64686570c29fbe7;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git x86: Fix the !CONFIG_NUMA build of the new CPU ID fixup code support I used "ifdef CONFIG_NUMA" simply because it doesn't make sense in a non-numa configuration even with SMP enabled. Besides, the only place where it is called right now is in kernel/cpu/amd.c:srat_detect_node() within the "CONFIG_NUMA" protected part. Signed-off-by: Steffen Persvold Cc: Daniel J Blueman Cc: Jesse Barnes Link: http://lkml.kernel.org/r/1323073238-32686-2-git-send-email-daniel@numascale-asia.com Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index ad4da45..a70bd5b 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_NUMA pr_err("NUMA core number %d differs from configured core number %d\n", node, c->phys_proc_id); +#endif } /*