x86: touch_nmi_watchdog(): reset alert counters for supported nmi_watchdog modes...

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>

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 19f1b95265cfeaf1cb80a569f5d382102ba63413..326a8f4f50f8abb802f45b0c44ace03ff45fa151 100644 (file)
--- 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;
 
                /*