From: David S. Miller <davem@davemloft.net>
Date: Wed, 9 Sep 2009 06:29:16 +0000 (-0700)
Subject: sparc64: Make touch_nmi_watchdog() actually work.
X-Git-Tag: v2.6.32-rc1~702^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d89be56b2153ccad7e8cd9e71b5d8b686632e8c2;p=linux.git

sparc64: Make touch_nmi_watchdog() actually work.

It guards it's actions on nmi_watchdog_active, but nothing ever
sets that and it's initial value is zero.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index d1614e8384ae..47a465fe3c38 100644
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -31,7 +31,6 @@
  * level 14 as our IRQ off level.
  */
 
-static int nmi_watchdog_active;
 static int panic_on_timeout;
 
 /* nmi_active:
@@ -52,7 +51,7 @@ static DEFINE_PER_CPU(int, nmi_touch);
 
 void touch_nmi_watchdog(void)
 {
-	if (nmi_watchdog_active) {
+	if (atomic_read(&nmi_active)) {
 		int cpu;
 
 		for_each_present_cpu(cpu) {