aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/nmi.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-09-09 02:29:16 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-09 02:29:16 -0400
commitd89be56b2153ccad7e8cd9e71b5d8b686632e8c2 (patch)
tree2b1a0a14e1c336c6eb0bf3b04de86843f1e989b7 /arch/sparc/kernel/nmi.c
parent4e85f5915dedb7c852c1e1189aa4133c87798a5e (diff)
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/kernel/nmi.c')
-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 d1614e8384ae..47a465fe3c38 100644
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -31,7 +31,6 @@
31 * level 14 as our IRQ off level. 31 * level 14 as our IRQ off level.
32 */ 32 */
33 33
34static int nmi_watchdog_active;
35static int panic_on_timeout; 34static int panic_on_timeout;
36 35
37/* nmi_active: 36/* nmi_active:
@@ -52,7 +51,7 @@ static DEFINE_PER_CPU(int, nmi_touch);
52 51
53void touch_nmi_watchdog(void) 52void touch_nmi_watchdog(void)
54{ 53{
55 if (nmi_watchdog_active) { 54 if (atomic_read(&nmi_active)) {
56 int cpu; 55 int cpu;
57 56
58 for_each_present_cpu(cpu) { 57 for_each_present_cpu(cpu) {