diff options
| author | Ingo Molnar | 2015-06-07 15:35:27 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-06-07 15:35:27 +0200 |
| commit | c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080 (patch) | |
| tree | 142041dd61132d487c2afddc8db32b350ee181ee /arch/x86/include/asm/irq_vectors.h | |
| parent | x86: Kill CONFIG_X86_HT (diff) | |
| parent | x86/mce: Handle Local MCE events (diff) | |
| download | kernel-qcow2-linux-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.tar.gz kernel-qcow2-linux-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.tar.xz kernel-qcow2-linux-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/irq_vectors.h')
| -rw-r--r-- | arch/x86/include/asm/irq_vectors.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h index 0ed29ac13a9d..4c2d2eb2060a 100644 --- a/arch/x86/include/asm/irq_vectors.h +++ b/arch/x86/include/asm/irq_vectors.h @@ -83,22 +83,23 @@ */ #define X86_PLATFORM_IPI_VECTOR 0xf7 -/* Vector for KVM to deliver posted interrupt IPI */ -#ifdef CONFIG_HAVE_KVM -#define POSTED_INTR_VECTOR 0xf2 #define POSTED_INTR_WAKEUP_VECTOR 0xf1 -#endif - /* * IRQ work vector: */ #define IRQ_WORK_VECTOR 0xf6 #define UV_BAU_MESSAGE 0xf5 +#define DEFERRED_ERROR_VECTOR 0xf4 /* Vector on which hypervisor callbacks will be delivered */ #define HYPERVISOR_CALLBACK_VECTOR 0xf3 +/* Vector for KVM to deliver posted interrupt IPI */ +#ifdef CONFIG_HAVE_KVM +#define POSTED_INTR_VECTOR 0xf2 +#endif + /* * Local APIC timer IRQ vector is on a different priority level, * to work around the 'lost local interrupt if more than 2 IRQ |