diff options
| author | Chris McDermott <lcm@us.ibm.com> | 2006-02-26 04:18:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-26 09:53:30 -0800 |
| commit | 1f9921539208f6d88f600a801e333d718e4a13ff (patch) | |
| tree | 2630bb5cf7ce4396c2e034fb333f673ed432008b /arch | |
| parent | e78256b8f3e2850ad55c2d69e1429e6c2607afd3 (diff) | |
| download | blackbird-op-linux-1f9921539208f6d88f600a801e333d718e4a13ff.tar.gz blackbird-op-linux-1f9921539208f6d88f600a801e333d718e4a13ff.zip | |
[PATCH] x86_64: Fix NMI watchdog on x460
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/io_apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 2585c1d92b26..ffab8a756664 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c @@ -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; } |
