diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-07 15:35:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-07 15:35:27 +0200 |
| commit | c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080 (patch) | |
| tree | 142041dd61132d487c2afddc8db32b350ee181ee /arch/x86/kernel/irqinit.c | |
| parent | c8e56d20f2d190d54c0615775dcb6a23c1091681 (diff) | |
| parent | 243d657eaf540db882f73497060da5a4f7d86a90 (diff) | |
| download | linux-stable-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.tar.gz linux-stable-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.tar.bz2 linux-stable-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.zip | |
Merge branch 'x86/ras' into x86/core, to fix conflicts
Conflicts:
arch/x86/include/asm/irq_vectors.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/irqinit.c')
| -rw-r--r-- | arch/x86/kernel/irqinit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 680723a8e4b6..a3a5e158ed69 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -135,6 +135,10 @@ static void __init apic_intr_init(void) alloc_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); #endif +#ifdef CONFIG_X86_MCE_AMD + alloc_intr_gate(DEFERRED_ERROR_VECTOR, deferred_error_interrupt); +#endif + #ifdef CONFIG_X86_LOCAL_APIC /* self generated IPI for local APIC timer */ alloc_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt); |