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/include/asm/entry_arch.h | |
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/include/asm/entry_arch.h')
-rw-r--r-- | arch/x86/include/asm/entry_arch.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/entry_arch.h b/arch/x86/include/asm/entry_arch.h index 27ca0afcccd7..df002992d8fd 100644 --- a/arch/x86/include/asm/entry_arch.h +++ b/arch/x86/include/asm/entry_arch.h @@ -52,4 +52,7 @@ BUILD_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR) BUILD_INTERRUPT(threshold_interrupt,THRESHOLD_APIC_VECTOR) #endif +#ifdef CONFIG_X86_MCE_AMD +BUILD_INTERRUPT(deferred_error_interrupt, DEFERRED_ERROR_VECTOR) +#endif #endif |