2 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index e7b7655c4e94..41218ac75d10 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -2199,7 +2199,9 @@ static inline void __init check_timer(void)
                         else
                                 add_pin_to_irq(0, apic2, pin2);
                         if (nmi_watchdog == NMI_IO_APIC) {
+                                disable_8259A_irq(0);
                                 setup_nmi();
+                                enable_8259A_irq(0);
                         }
                         goto out;
                 }
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index 6433fc99f1f9..aa45a85c4d11 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1702,7 +1702,9 @@ static inline void __init check_timer(void)
                         apic_printk(APIC_VERBOSE," works.\n");
                         nmi_watchdog_default();
                         if (nmi_watchdog == NMI_IO_APIC) {
+                                disable_8259A_irq(0);
                                 setup_nmi();
+                                enable_8259A_irq(0);
                         }
                         goto out;
                 }