summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-06-12 17:08:16 +0400
committerIngo Molnar <mingo@elte.hu>2008-06-12 15:14:54 +0200
commitf781b03c4b1c713ac000877c8bbc31fc4164a29b (patch)
treeb90246ed36444bd99f8b1e2e19284ae8a7ec427f /arch
parent75b9f5d2a0318da9d5e694a9a1be33f46b4c021e (diff)
x86: touch_nmi_watchdog(): reset alert counters for supported nmi_watchdog modes only
The checking 'if nmi_watchdog > 0' (ie NMI_NONE) is quite fast but it has a side effect - it's taken even if nmi_watchdog = NMI_DISABLED. Nowadays nmi_watchdog is set up to NMI_NONE by default so this condition is properly taken most the time but we better show this explicitly. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/nmi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 19f1b95265cf..326a8f4f50f8 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -354,7 +354,8 @@ static DEFINE_PER_CPU(int, nmi_touch);
void touch_nmi_watchdog(void)
{
- if (nmi_watchdog > 0) {
+ if (nmi_watchdog == NMI_LOCAL_APIC ||
+ nmi_watchdog == NMI_IO_APIC) {
unsigned cpu;
/*