Skip to content

Commit

Permalink
x86: Recover timer_ack lost in the merge of the NMI watchdog
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Maciej W. Rozycki authored and Ingo Molnar committed Jul 11, 2008
1 parent af17478 commit 5b4d238
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/x86/kernel/nmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 5b4d238

Please sign in to comment.