[PATCH] x86: touch_nmi_watchdog - reset alert counters forsupported nmi_watchdog modes only

[Cyrill Gorcunov]

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

The patch is over tip/master

	commit 169f18cf265d4107ec8227f278afa0bb7f6f3dc3
	Author: Ingo Molnar <mingo@xxxxxxx>
	Date:   Tue Jun 10 16:38:41 2008 +0200

	    x86: unify the reserve_bootmem() behavior of early_res_to_bootmem()

Please, review. Any comments are welcome.


Index: linux-2.6.git/arch/x86/kernel/nmi.c
====================================================================
--- linux-2.6.git.orig/arch/x86/kernel/nmi.c	2008-06-12 12:27:04.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/nmi.c	2008-06-12 16:53:26.000000000 +0400
@@ -355,7 +355,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;
 
 		/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/