Messages in this thread Patch in this message | | | Date | Sat, 19 Sep 2009 18:04:35 GMT | From | tip-bot for Andreas Herrmann <> | Subject | [tip:x86/urgent] x86, mce: Fix compile warning in case of CONFIG_SMP=n |
| |
Commit-ID: a017421ddcdf34474f1133b27e33ab2ca6c19b96 Gitweb: http://git.kernel.org/tip/a017421ddcdf34474f1133b27e33ab2ca6c19b96 Author: Andreas Herrmann <andreas.herrmann3@amd.com> AuthorDate: Tue, 15 Sep 2009 17:17:27 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Sat, 19 Sep 2009 19:48:14 +0200
x86, mce: Fix compile warning in case of CONFIG_SMP=n
Fix following compile warning:
arch/x86/kernel/cpu/mcheck/mce_amd.c: In function 'threshold_create_bank': arch/x86/kernel/cpu/mcheck/mce_amd.c:492: warning: unused variable 'c'
which shows up when kernel is compiled with CONFIG_SMP=n.
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com> LKML-Reference: <20090915151727.GB21670@alberich.amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- arch/x86/kernel/cpu/mcheck/mce_amd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 8cd5224..83a3d1f 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -489,8 +489,9 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) int i, err = 0; struct threshold_bank *b = NULL; char name[32]; +#ifdef CONFIG_SMP struct cpuinfo_x86 *c = &cpu_data(cpu); - +#endif sprintf(name, "threshold_bank%i", bank);
| |