diff options
-rw-r--r-- | arch/sparc/kernel/nmi.c | 3 |
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 | ||
34 | static int nmi_watchdog_active; | ||
35 | static int panic_on_timeout; | 34 | static 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 | ||
53 | void touch_nmi_watchdog(void) | 52 | void 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) { |