From: Maciej W. Rozycki <macro@linux-mips.org>
Date: Fri, 11 Jul 2008 18:47:15 +0000 (+0100)
Subject: x86: Recover timer_ack lost in the merge of the NMI watchdog
X-Git-Tag: v2.6.27-rc1~1106^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b4d2386c23e5de553fce002892c7691a989b350;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed