From b357ffd93655a014941e7419743f5421b5cc0e33 Mon Sep 17 00:00:00 2001
From: Daniel Walker <dwalker@mvista.com>
Date: Thu, 6 Sep 2007 16:59:54 +0200
Subject: [PATCH] --- yaml --- r: 64770 b: refs/heads/master c:
 d95865480de280b892e19fe90921601876da5775 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8e34c509b58c..b97fe977f277 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a534b679180025aa324ebd63c05516e478551cfd
+refs/heads/master: d95865480de280b892e19fe90921601876da5775
diff --git a/trunk/arch/i386/kernel/nmi.c b/trunk/arch/i386/kernel/nmi.c
index 8c1c965eb2a8..c7227e2180f8 100644
--- a/trunk/arch/i386/kernel/nmi.c
+++ b/trunk/arch/i386/kernel/nmi.c
@@ -115,12 +115,12 @@ static int __init check_nmi_watchdog(void)
 			atomic_dec(&nmi_active);
 		}
 	}
+	endflag = 1;
 	if (!atomic_read(&nmi_active)) {
 		kfree(prev_nmi_count);
 		atomic_set(&nmi_active, -1);
 		return -1;
 	}
-	endflag = 1;
 	printk("OK.\n");
 
 	/* now that we know it works we can reduce NMI frequency to