diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-21 13:57:54 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-21 13:57:54 +1000 |
| commit | c669c1cfdb51f5108b2da90a5d0f5c3dd2099242 (patch) | |
| tree | 344680942a6eef7586c7828285a82aea33f62f9d /arch/x86/kernel/irqinit.c | |
| parent | a6873c7d11f681a21826a370341e36ac9f1f0af3 (diff) | |
| parent | 0b251ee3e2dc6e09ac357fa65f3e0963a1176e1a (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Diffstat (limited to 'arch/x86/kernel/irqinit.c')
| -rw-r--r-- | arch/x86/kernel/irqinit.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index f470e4ef993e..f09d4bbe2d2d 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -272,9 +272,6 @@ static void __init apic_intr_init(void) #ifdef CONFIG_X86_MCE_THRESHOLD alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); #endif -#if defined(CONFIG_X86_MCE) && defined(CONFIG_X86_LOCAL_APIC) - alloc_intr_gate(MCE_SELF_VECTOR, mce_self_interrupt); -#endif #if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC) /* self generated IPI for local APIC timer */ |