aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/oprofile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-09-09 02:16:06 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-09 02:16:06 -0400
commita8f22264550e64c0cd11fb6647284b0bd6407f9c (patch)
treee42ef7f04063bef6114c6488c70eff7089b5ea26 /arch/sparc/oprofile
parent825c9fb47a0837db12fecf8d360e0e1d284ddb49 (diff)
sparc64: Manage NMI watchdog enabling like x86.
Use a per-cpu 'wd_enabled' boolean and a global atomic_t count of watchdog NMI enabled cpus which is set to '-1' if something is wrong with the watchdog and it can't be used. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/oprofile')
-rw-r--r--arch/sparc/oprofile/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/oprofile/init.c b/arch/sparc/oprofile/init.c
index d172f86439b1..9ce34fd294c9 100644
--- a/arch/sparc/oprofile/init.c
+++ b/arch/sparc/oprofile/init.c
@@ -57,7 +57,7 @@ static void timer_stop(void)
57 57
58static int op_nmi_timer_init(struct oprofile_operations *ops) 58static int op_nmi_timer_init(struct oprofile_operations *ops)
59{ 59{
60 if (!nmi_usable) 60 if (atomic_read(&nmi_active) <= 0)
61 return -ENODEV; 61 return -ENODEV;
62 62
63 ops->start = timer_start; 63 ops->start = timer_start;