From bdd379c50c8a770c8201f568a40dee47d80b9547 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Thu, 12 Feb 2009 13:49:30 +0100 Subject: [PATCH] --- yaml --- r: 138640 b: refs/heads/master c: 41fdff322e26c4a86fe65cf577f2556a650cb7bc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/mce.h | 6 ++++++ trunk/arch/x86/kernel/cpu/mcheck/mce_64.c | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a100aaf76cfc..19254eac3425 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc731ca60954310be0993e8992d450c7089fd13d +refs/heads/master: 41fdff322e26c4a86fe65cf577f2556a650cb7bc diff --git a/trunk/arch/x86/include/asm/mce.h b/trunk/arch/x86/include/asm/mce.h index 225cdb5d2bfc..39136c497c5e 100644 --- a/trunk/arch/x86/include/asm/mce.h +++ b/trunk/arch/x86/include/asm/mce.h @@ -95,6 +95,12 @@ void mce_log(struct mce *m); DECLARE_PER_CPU(struct sys_device, device_mce); extern void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu); +/* + * To support more than 128 would need to escape the predefined + * Linux defined extended banks first. + */ +#define MAX_NR_BANKS (MCE_EXTENDED_BANK - 1) + #ifdef CONFIG_X86_MCE_INTEL void mce_intel_feature_init(struct cpuinfo_x86 *c); #else diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c index a4a7c686ce90..39f8bb525a74 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c @@ -37,12 +37,6 @@ #define MISC_MCELOG_MINOR 227 -/* - * To support more than 128 would need to escape the predefined - * Linux defined extended banks first. - */ -#define MAX_NR_BANKS (MCE_EXTENDED_BANK - 1) - atomic_t mce_entry; static int mce_dont_init;