[xen master] x86: purge NMI_IO_APIC

[patchbot@xxxxxxx]

commit 40a74677023a5eb20d7bbc09def37884f80919bd
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Jan 29 09:23:43 2024 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jan 29 09:23:43 2024 +0100

    x86: purge NMI_IO_APIC
    
    Even going back to 3.2 source code, I can't spot how this watchdog mode
    could ever have been enabled in Xen. The only effect its presence had
    for all the years was the retaining of a dead string literal.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/include/asm/apic.h | 3 +--
 xen/arch/x86/io_apic.c          | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/xen/arch/x86/include/asm/apic.h b/xen/arch/x86/include/asm/apic.h
index b20fae7ebc..d1cb001fb4 100644
--- a/xen/arch/x86/include/asm/apic.h
+++ b/xen/arch/x86/include/asm/apic.h
@@ -186,7 +186,6 @@ extern void check_nmi_watchdog(void);
 
 extern unsigned int nmi_watchdog;
 #define NMI_NONE       0
-#define NMI_IO_APIC    1
-#define NMI_LOCAL_APIC 2
+#define NMI_LOCAL_APIC 1
 
 #endif /* __ASM_APIC_H */
diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index dd25ba3943..b48a642465 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -2004,11 +2004,6 @@ static void __init check_timer(void)
     }
     printk(" failed.\n");
 
-    if (nmi_watchdog == NMI_IO_APIC) {
-        printk(KERN_WARNING "timer doesn't work through the IO-APIC - 
disabling NMI Watchdog!\n");
-        nmi_watchdog = 0;
-    }
-
     printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ...");
 
     disable_8259A_irq(irq_to_desc(0));
--
generated by git-patchbot for /home/xen/git/xen.git#master