From 9ad41d01becac15cffaf0d452a29637e92476905 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 17 Jul 2007 04:03:57 -0700
Subject: [PATCH] --- yaml --- r: 60776 b: refs/heads/master c:
 f2890255b0ade497893d1e5e99f519b5c1d50f7d h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/kernel/nmi.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e1c38213527b..fd00ef7fe09c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c978b935e81da9434342f0bc8263c6cfe1214ce
+refs/heads/master: f2890255b0ade497893d1e5e99f519b5c1d50f7d
diff --git a/trunk/arch/i386/kernel/nmi.c b/trunk/arch/i386/kernel/nmi.c
index fba121f7973f..03b7f5584d71 100644
--- a/trunk/arch/i386/kernel/nmi.c
+++ b/trunk/arch/i386/kernel/nmi.c
@@ -295,7 +295,7 @@ static unsigned int
 	last_irq_sums [NR_CPUS],
 	alert_counter [NR_CPUS];
 
-void touch_nmi_watchdog (void)
+void touch_nmi_watchdog(void)
 {
 	if (nmi_watchdog > 0) {
 		unsigned cpu;
@@ -304,8 +304,10 @@ void touch_nmi_watchdog (void)
 		 * Just reset the alert counters, (other CPUs might be
 		 * spinning on locks we hold):
 		 */
-		for_each_present_cpu (cpu)
-			alert_counter[cpu] = 0;
+		for_each_present_cpu(cpu) {
+			if (alert_counter[cpu])
+				alert_counter[cpu] = 0;
+		}
 	}
 
 	/*