|
@@ -7856,14 +7856,14 @@ static void perf_pmu_rotate_stop(struct pmu *pmu)
|
|
|
static void __perf_event_exit_context(void *__info)
|
|
|
{
|
|
|
struct perf_event_context *ctx = __info;
|
|
|
- struct perf_event *event, *tmp;
|
|
|
+ struct perf_event *event;
|
|
|
|
|
|
perf_pmu_rotate_stop(ctx->pmu);
|
|
|
|
|
|
- list_for_each_entry_safe(event, tmp, &ctx->pinned_groups, group_entry)
|
|
|
- __perf_remove_from_context(event);
|
|
|
- list_for_each_entry_safe(event, tmp, &ctx->flexible_groups, group_entry)
|
|
|
+ rcu_read_lock();
|
|
|
+ list_for_each_entry_rcu(event, &ctx->event_list, event_entry)
|
|
|
__perf_remove_from_context(event);
|
|
|
+ rcu_read_unlock();
|
|
|
}
|
|
|
|
|
|
static void perf_event_exit_cpu_context(int cpu)
|
|
@@ -7887,11 +7887,11 @@ static void perf_event_exit_cpu(int cpu)
|
|
|
{
|
|
|
struct swevent_htable *swhash = &per_cpu(swevent_htable, cpu);
|
|
|
|
|
|
+ perf_event_exit_cpu_context(cpu);
|
|
|
+
|
|
|
mutex_lock(&swhash->hlist_mutex);
|
|
|
swevent_hlist_release(swhash);
|
|
|
mutex_unlock(&swhash->hlist_mutex);
|
|
|
-
|
|
|
- perf_event_exit_cpu_context(cpu);
|
|
|
}
|
|
|
#else
|
|
|
static inline void perf_event_exit_cpu(int cpu) { }
|