projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e78256b
)
[PATCH] x86_64: Fix NMI watchdog on x460
author
Chris McDermott
<lcm@us.ibm.com>
Sun, 26 Feb 2006 03:18:40 +0000
(
04:18
+0100)
committer
Linus 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
patch
|
blob
|
history
diff --git
a/arch/x86_64/kernel/io_apic.c
b/arch/x86_64/kernel/io_apic.c
index
2585c1d
..
ffab8a7
100644
(file)
--- 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;
}