Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754813Ab2BCTSJ (ORCPT ); Fri, 3 Feb 2012 14:18:09 -0500 Received: from mail.skyhub.de ([78.46.96.112]:47526 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754063Ab2BCTSH (ORCPT ); Fri, 3 Feb 2012 14:18:07 -0500 Date: Fri, 3 Feb 2012 20:18:01 +0100 From: Borislav Petkov To: Nick Bowler , Randy Dunlap Cc: "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , LKML , Kevin Winchester Subject: MCE, AMD: Hide smp-only code around CONFIG_SMP Message-ID: <20120203191801.GA2846@x1.osrc.amd.com> Mail-Followup-To: Borislav Petkov , Nick Bowler , Randy Dunlap , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , LKML , Kevin Winchester References: <1328209817-18913-1-git-send-email-bp@alien8.de> <20120202193702.GA9502@elliptictech.com> <20120202202427.GA2234@x1.osrc.amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20120202202427.GA2234@x1.osrc.amd.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2370 Lines: 70 On Thu, Feb 02, 2012 at 09:24:28PM +0100, Borislav Petkov wrote: > > Is this feature truly irrelevant on UP systems? I ask because I've > > always enabled this option on my UP AMD systems in the past... > > No, you're right. Thanks for the suggestion. Scratch that version, I'll > think of a better fix. Ok, I think I got it, pls take a look and scream if something's amiss. @Randy: it builds fine with your randconfig and with mine default one; I'd appreciate if you could run it too, just in case. Thanks. -- From: Borislav Petkov Date: Fri, 3 Feb 2012 18:07:54 +0100 Subject: [PATCH] MCE, AMD: Hide smp-only code around CONFIG_SMP 141168c36cde ("x86: Simplify code by removing a !SMP #ifdefs from 'struct cpuinfo_x86'") removed a bunch of CONFIG_SMP ifdefs around code touching struct cpuinfo_x86 members but also caused the following build error with Randy's randconfigs: mce_amd.c:(.cpuinit.text+0x4723): undefined reference to `cpu_llc_shared_map' Restore the #ifdef in threshold_create_bank() which creates symlinks on the non-BSP CPUs. Cc: Kevin Winchester Cc: Ingo Molnar Cc: Randy Dunlap Link: http://lkml.kernel.org/r/4F298A6C.6010101@xenotime.net Signed-off-by: Borislav Petkov --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 786e76a..e4eeaaf 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -528,6 +528,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) sprintf(name, "threshold_bank%i", bank); +#ifdef CONFIG_SMP if (cpu_data(cpu).cpu_core_id && shared_bank[bank]) { /* symlink */ i = cpumask_first(cpu_llc_shared_mask(cpu)); @@ -553,6 +554,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) goto out; } +#endif b = kzalloc(sizeof(struct threshold_bank), GFP_KERNEL); if (!b) { -- 1.7.9 -- Regards/Gruss, Boris. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/