|
@@ -2920,12 +2920,6 @@ int perf_event_release_kernel(struct perf_event *event)
|
|
|
{
|
|
|
struct perf_event_context *ctx = event->ctx;
|
|
|
|
|
|
- /*
|
|
|
- * Remove from the PMU, can't get re-enabled since we got
|
|
|
- * here because the last ref went.
|
|
|
- */
|
|
|
- perf_event_disable(event);
|
|
|
-
|
|
|
WARN_ON_ONCE(ctx->parent_ctx);
|
|
|
/*
|
|
|
* There are two ways this annotation is useful:
|
|
@@ -2942,8 +2936,8 @@ int perf_event_release_kernel(struct perf_event *event)
|
|
|
mutex_lock_nested(&ctx->mutex, SINGLE_DEPTH_NESTING);
|
|
|
raw_spin_lock_irq(&ctx->lock);
|
|
|
perf_group_detach(event);
|
|
|
- list_del_event(event, ctx);
|
|
|
raw_spin_unlock_irq(&ctx->lock);
|
|
|
+ perf_remove_from_context(event);
|
|
|
mutex_unlock(&ctx->mutex);
|
|
|
|
|
|
free_event(event);
|