Revert "x86, io-apic: fix nmi_watchdog=1 bootup hang"

This reverts commit 2229ff84f01746d02fb6b79e156fb5cce48c908f.

A better fix from Maciej will be merged.

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 3cebf91d500f7052ea09c42ea816408db5763517..4b99b1bdeb6cbb090e5868138922b259da7d98fe 100644 (file)
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -541,13 +541,11 @@ void __init setup_boot_APIC_clock(void)
                 * PIT/HPET going.  Otherwise register lapic as a dummy
                 * device.
                 */
-               if (nmi_watchdog != NMI_IO_APIC) {
+               if (nmi_watchdog != NMI_IO_APIC)
                        lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
-               } else {
+               else
                        printk(KERN_WARNING "APIC timer registered as dummy,"
                               " due to nmi_watchdog=1!\n");
-                       timer_through_8259 = 1;
-               }
        }
 
        /* Setup the lapic or request the broadcast */

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 6cbc668a4c6399159bccdcc840d4d7fdd408656c..07fda23a9f76aaab918a2c38db509e3b3d4c7dbb 100644 (file)
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -413,13 +413,11 @@ void __init setup_boot_APIC_clock(void)
         * PIT/HPET going.  Otherwise register lapic as a dummy
         * device.
         */
-       if (nmi_watchdog != NMI_IO_APIC) {
+       if (nmi_watchdog != NMI_IO_APIC)
                lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
-       } else {
+       else
                printk(KERN_WARNING "APIC timer registered as dummy,"
                       " due to nmi_watchdog=1!\n");
-               timer_through_8259 = 1;
-       }
 
        setup_APIC_timer();
 }