[PATCH] x86_64: Fix NMI watchdog on x460
authorChris McDermott <lcm@us.ibm.com>
Sun, 26 Feb 2006 03:18:40 +0000 (04:18 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 26 Feb 2006 17:53:30 +0000 (09:53 -0800)
[description from AK]

Old check for the IO-APIC watchdog during the timer check was wrong -
it obviously should only drop into this if the IO-APIC watchdog is used.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/x86_64/kernel/io_apic.c

index 2585c1d92b26bd2b9443433f9a1b83c25e36dc3e..ffab8a75666428bf681326ed83f20caef0b6fd9b 100644 (file)
@@ -1850,7 +1850,7 @@ static inline void check_timer(void)
        }
        printk(" failed.\n");
 
-       if (nmi_watchdog) {
+       if (nmi_watchdog == NMI_IO_APIC) {
                printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");
                nmi_watchdog = 0;
        }