| commit | 5b4d2386c23e5de553fce002892c7691a989b350 | |
| author | Maciej W. Rozycki <macro@linux-mips.org> | |
| Fri, 11 Jul 2008 18:47:15 +0000 (11 19:47 +0100) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Fri, 11 Jul 2008 18:54:03 +0000 (11 20:54 +0200) | ||
| tree | b0bf5af0b0304d45f2960e8278a293b115d3db64 | treesnapshot (tar.gz zip) |
| parent | af174783b9251f0afd4bb78927221bcaaa65d3ac | commitdiff |
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>
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>
| arch/x86/kernel/nmi.c | diffblobblamehistory |