diff options
| author |   Andi Kleen <andi@firstfloor.org> | 2009-07-09 00:31:41 +0200 |
|---|---|---|
| committer |   H. Peter Anvin <hpa@zytor.com> | 2009-07-09 18:39:47 -0700 |
| commit | c1ebf835617035b1f08f734247dcb981e17aac6b (patch) | |
| tree | 7d47021cef80d34032da007d2b9e7c4be9ed8e89 /arch/x86/kernel/irq.c | |
| parent | x86: mce: Remove old i386 machine check code (diff) | |
| download | linux-dev-c1ebf835617035b1f08f734247dcb981e17aac6b.tar.xz linux-dev-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/irq.c')
| -rw-r--r-- | arch/x86/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index b0cdde6932f5..74656d1d4e30 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -104,7 +104,7 @@ static int show_other_interrupts(struct seq_file *p, int prec) seq_printf(p, " Threshold APIC interrupts\n"); # endif #endif -#ifdef CONFIG_X86_NEW_MCE +#ifdef CONFIG_X86_MCE seq_printf(p, "%*s: ", prec, "MCE"); for_each_online_cpu(j) seq_printf(p, "%10u ", per_cpu(mce_exception_count, j)); @@ -200,7 +200,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu) sum += irq_stats(cpu)->irq_threshold_count; # endif #endif -#ifdef CONFIG_X86_NEW_MCE +#ifdef CONFIG_X86_MCE sum += per_cpu(mce_exception_count, cpu); sum += per_cpu(mce_poll_count, cpu); #endif |