diff options
| author | Andi Kleen <andi@firstfloor.org> | 2009-07-09 00:31:41 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-10 03:39:47 +0200 |
| commit | c1ebf835617035b1f08f734247dcb981e17aac6b (patch) | |
| tree | 7d47021cef80d34032da007d2b9e7c4be9ed8e89 /arch/x86/kernel/apic/nmi.c | |
| parent | x86: mce: Remove old i386 machine check code (diff) | |
| download | linux-c1ebf835617035b1f08f734247dcb981e17aac6b.tar.xz linux-c1ebf835617035b1f08f734247dcb981e17aac6b.zip | |
x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE
Drop the CONFIG_X86_NEW_MCE symbol and change all
references to it to check for CONFIG_X86_MCE directly.
No code changes
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/apic/nmi.c')
| -rw-r--r-- | arch/x86/kernel/apic/nmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c index b3025b43b63a..f4227289caf7 100644 --- a/arch/x86/kernel/apic/nmi.c +++ b/arch/x86/kernel/apic/nmi.c @@ -66,7 +66,7 @@ static inline unsigned int get_nmi_count(int cpu) static inline int mce_in_progress(void) { -#if defined(CONFIG_X86_NEW_MCE) +#if defined(CONFIG_X86_MCE) return atomic_read(&mce_entry) > 0; #endif return 0; |