2 files changed, 8 insertions, 7 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index a79e59fc3b7d..6cb5d483ab34 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -54,6 +54,7 @@ struct perf_guest_info_callbacks {
 #include <linux/sysfs.h>
 #include <linux/perf_regs.h>
 #include <linux/cgroup.h>
+#include <linux/refcount.h>
 #include <asm/local.h>
 
 struct perf_callchain_entry {
@@ -737,7 +738,7 @@ struct perf_event_context {
         int                             nr_stat;
         int                             nr_freq;
         int                             rotate_disable;
-        atomic_t                        refcount;
+        refcount_t                      refcount;
         struct task_struct              *task;
 
         /*
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 5b89de7918d0..677164d54547 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1172,7 +1172,7 @@ static void perf_event_ctx_deactivate(struct perf_event_context *ctx)
 
 static void get_ctx(struct perf_event_context *ctx)
 {
-        WARN_ON(!atomic_inc_not_zero(&ctx->refcount));
+        refcount_inc(&ctx->refcount);
 }
 
 static void free_ctx(struct rcu_head *head)
@@ -1186,7 +1186,7 @@ static void free_ctx(struct rcu_head *head)
 
 static void put_ctx(struct perf_event_context *ctx)
 {
-        if (atomic_dec_and_test(&ctx->refcount)) {
+        if (refcount_dec_and_test(&ctx->refcount)) {
                 if (ctx->parent_ctx)
                         put_ctx(ctx->parent_ctx);
                 if (ctx->task && ctx->task != TASK_TOMBSTONE)
@@ -1268,7 +1268,7 @@ perf_event_ctx_lock_nested(struct perf_event *event, int nesting)
 again:
         rcu_read_lock();
         ctx = READ_ONCE(event->ctx);
-        if (!atomic_inc_not_zero(&ctx->refcount)) {
+        if (!refcount_inc_not_zero(&ctx->refcount)) {
                 rcu_read_unlock();
                 goto again;
         }
@@ -1401,7 +1401,7 @@ retry:
                 }
 
                 if (ctx->task == TASK_TOMBSTONE ||
-                    !atomic_inc_not_zero(&ctx->refcount)) {
+                    !refcount_inc_not_zero(&ctx->refcount)) {
                         raw_spin_unlock(&ctx->lock);
                         ctx = NULL;
                 } else {
@@ -4057,7 +4057,7 @@ static void __perf_event_init_context(struct perf_event_context *ctx)
         INIT_LIST_HEAD(&ctx->event_list);
         INIT_LIST_HEAD(&ctx->pinned_active);
         INIT_LIST_HEAD(&ctx->flexible_active);
-        atomic_set(&ctx->refcount, 1);
+        refcount_set(&ctx->refcount, 1);
 }
 
 static struct perf_event_context *
@@ -10613,7 +10613,7 @@ __perf_event_ctx_lock_double(struct perf_event *group_leader,
 again:
         rcu_read_lock();
         gctx = READ_ONCE(group_leader->ctx);
-        if (!atomic_inc_not_zero(&gctx->refcount)) {
+        if (!refcount_inc_not_zero(&gctx->refcount)) {
                 rcu_read_unlock();
                 goto again;
         }