diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-08 23:16:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-08 23:16:06 -0700 |
| commit | a8f22264550e64c0cd11fb6647284b0bd6407f9c (patch) | |
| tree | e42ef7f04063bef6114c6488c70eff7089b5ea26 /arch/sparc/oprofile/init.c | |
| parent | 825c9fb47a0837db12fecf8d360e0e1d284ddb49 (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/init.c')
| -rw-r--r-- | arch/sparc/oprofile/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/oprofile/init.c b/arch/sparc/oprofile/init.c index d172f86439b..9ce34fd294c 100644 --- a/arch/sparc/oprofile/init.c +++ b/arch/sparc/oprofile/init.c @@ -57,7 +57,7 @@ static void timer_stop(void) static int op_nmi_timer_init(struct oprofile_operations *ops) { - if (!nmi_usable) + if (atomic_read(&nmi_active) <= 0) return -ENODEV; ops->start = timer_start; |