diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2008-07-11 19:47:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 20:54:03 +0200 |
| commit | 5b4d2386c23e5de553fce002892c7691a989b350 (patch) | |
| tree | b0bf5af0b0304d45f2960e8278a293b115d3db64 /arch/x86/kernel/nmi.c | |
| parent | af174783b9251f0afd4bb78927221bcaaa65d3ac (diff) | |
| download | blackbird-op-linux-5b4d2386c23e5de553fce002892c7691a989b350.tar.gz blackbird-op-linux-5b4d2386c23e5de553fce002892c7691a989b350.zip | |
x86: Recover timer_ack lost in the merge of the NMI watchdog
In the course of the recent unification of the NMI watchdog an assignment
to timer_ack to switch off unnecesary POLL commands to the 8259A in the
case of a watchdog failure has been accidentally removed. The statement
used to be limited to the 32-bit variation as since the rewrite of the
timer code it has been relevant for the 82489DX only. This change brings
it back.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/nmi.c')
| -rw-r--r-- | arch/x86/kernel/nmi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 8dfe9db87a9e..716b89284be0 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -171,6 +171,9 @@ int __init check_nmi_watchdog(void) error: if (nmi_watchdog == NMI_IO_APIC && !timer_through_8259) disable_8259A_irq(0); +#ifdef CONFIG_X86_32 + timer_ack = 0; +#endif return -1; } |
