summaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-09-08 23:29:16 -0700
committerDavid S. Miller <davem@davemloft.net>2009-09-08 23:29:16 -0700
commitd89be56b2153ccad7e8cd9e71b5d8b686632e8c2 (patch)
tree2b1a0a14e1c336c6eb0bf3b04de86843f1e989b7 /arch/sparc
parent4e85f5915dedb7c852c1e1189aa4133c87798a5e (diff)
downloadop-kernel-dev-d89be56b2153ccad7e8cd9e71b5d8b686632e8c2.zip
op-kernel-dev-d89be56b2153ccad7e8cd9e71b5d8b686632e8c2.tar.gz
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>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/kernel/nmi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index d1614e8..47a465f 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) {
OpenPOWER on IntegriCloud