diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:50:48 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:50:48 +0200 |
commit | 2257e268b1154966c5b0141b23695db1043ff39d (patch) | |
tree | dae4b032afb9872568cf7921b39d30c79a6c3fee /arch/x86/include/asm/irq_vectors.h | |
parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) |
Merge branch 'linus' into x86/boot, to pick up fixes
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h index 6ca9fd6234e1..aaf8d28b5d00 100644 --- a/arch/x86/include/asm/irq_vectors.h +++ b/arch/x86/include/asm/irq_vectors.h @@ -83,7 +83,6 @@ */ #define X86_PLATFORM_IPI_VECTOR 0xf7 -#define POSTED_INTR_WAKEUP_VECTOR 0xf1 /* * IRQ work vector: */ @@ -98,6 +97,8 @@ /* Vector for KVM to deliver posted interrupt IPI */ #ifdef CONFIG_HAVE_KVM #define POSTED_INTR_VECTOR 0xf2 +#define POSTED_INTR_WAKEUP_VECTOR 0xf1 +#define POSTED_INTR_NESTED_VECTOR 0xf0 #endif /* |