Skip to content

Commit 0cbca1b

Browse files
committed
x86: irq: unconditionally define KVM interrupt vectors
Unlike arch/x86/kernel/idt.c, FRED support chose to remove the #ifdefs from the .c files and concentrate them in the headers, where unused handlers are #define'd to NULL. However, the constants for KVM's 3 posted interrupt vectors are still defined conditionally in irq_vectors.h. In the tree that FRED support was developed on, this is innocuous because CONFIG_HAVE_KVM was effectively always set. With the cleanups that recently went into the KVM tree to remove CONFIG_HAVE_KVM, the conditional became IS_ENABLED(CONFIG_KVM). This causes a linux-next compilation failure in FRED code, when CONFIG_KVM=n. In preparation for the merging of FRED in Linux 6.9, define the interrupt vector numbers unconditionally. Cc: [email protected] Reported-by: Stephen Rothwell <[email protected]> Suggested-by: Xin Li (Intel) <[email protected]> Suggested-by: Thomas Gleixner <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 687d8f4 commit 0cbca1b

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/x86/include/asm/irq_vectors.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,9 @@
8484
#define HYPERVISOR_CALLBACK_VECTOR 0xf3
8585

8686
/* Vector for KVM to deliver posted interrupt IPI */
87-
#if IS_ENABLED(CONFIG_KVM)
8887
#define POSTED_INTR_VECTOR 0xf2
8988
#define POSTED_INTR_WAKEUP_VECTOR 0xf1
9089
#define POSTED_INTR_NESTED_VECTOR 0xf0
91-
#endif
9290

9391
#define MANAGED_IRQ_SHUTDOWN_VECTOR 0xef
9492

0 commit comments

Comments
 (0)