Merge commit 'v2.6.32-rc3'

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/sparc/oprofile/init.c b/arch/sparc/oprofile/init.c
index d172f86439b1..f97cb8b6ee5f 100644
--- a/arch/sparc/oprofile/init.c
+++ b/arch/sparc/oprofile/init.c
@@ -21,7 +21,7 @@
 static int profile_timer_exceptions_notify(struct notifier_block *self,
                                            unsigned long val, void *data)
 {
-        struct die_args *args = (struct die_args *)data;
+        struct die_args *args = data;
         int ret = NOTIFY_DONE;
 
         switch (val) {
@@ -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;