2 files changed, 1 insertions, 31 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index dfa725723f28..5c58e93c130c 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -785,7 +785,6 @@ struct perf_cpu_context {
         ktime_t                         hrtimer_interval;
         unsigned int                    hrtimer_active;
 
-        struct pmu                      *unique_pmu;
 #ifdef CONFIG_CGROUP_PERF
         struct perf_cgroup              *cgrp;
         struct list_head                cgrp_cpuctx_entry;
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 928a818d912e..d92c7ad7715d 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2932,7 +2932,7 @@ static void perf_pmu_sched_task(struct task_struct *prev,
                 return;
 
         list_for_each_entry(cpuctx, this_cpu_ptr(&sched_cb_list), sched_cb_entry) {
-                pmu = cpuctx->unique_pmu; /* software PMUs will not have sched_task */
+                pmu = cpuctx->ctx.pmu; /* software PMUs will not have sched_task */
 
                 if (WARN_ON_ONCE(!pmu->sched_task))
                         continue;
@@ -8636,37 +8636,10 @@ static struct perf_cpu_context __percpu *find_pmu_context(int ctxn)
         return NULL;
 }
 
-static void update_pmu_context(struct pmu *pmu, struct pmu *old_pmu)
-{
-        int cpu;
-
-        for_each_possible_cpu(cpu) {
-                struct perf_cpu_context *cpuctx;
-
-                cpuctx = per_cpu_ptr(pmu->pmu_cpu_context, cpu);
-
-                if (cpuctx->unique_pmu == old_pmu)
-                        cpuctx->unique_pmu = pmu;
-        }
-}
-
 static void free_pmu_context(struct pmu *pmu)
 {
-        struct pmu *i;
-
         mutex_lock(&pmus_lock);
-        /*
-         * Like a real lame refcount.
-         */
-        list_for_each_entry(i, &pmus, entry) {
-                if (i->pmu_cpu_context == pmu->pmu_cpu_context) {
-                        update_pmu_context(i, pmu);
-                        goto out;
-                }
-        }
-
         free_percpu(pmu->pmu_cpu_context);
-out:
         mutex_unlock(&pmus_lock);
 }
 
@@ -8870,8 +8843,6 @@ skip_type:
                 cpuctx->ctx.pmu = pmu;
 
                 __perf_mux_hrtimer_init(cpuctx, cpu);
-
-                cpuctx->unique_pmu = pmu;
         }
 
 got_cpu_context: