diff options
| -rw-r--r-- | kernel/events/core.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index fa6dab08be47..f75b0d38a40f 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5696,7 +5696,6 @@ int perf_event_release_kernel(struct perf_event *event) { struct perf_event_context *ctx = event->ctx; struct perf_event *child, *tmp; - LIST_HEAD(free_list); /* * If we got here through err_alloc: free_event(event); we will not @@ -5765,23 +5764,23 @@ again: struct perf_event, child_list); if (tmp == child) { perf_remove_from_context(child, DETACH_GROUP | DETACH_CHILD); - list_add(&child->child_list, &free_list); + } else { + child = NULL; } mutex_unlock(&event->child_mutex); mutex_unlock(&ctx->mutex); + + if (child) { + /* Last reference unless ->pending_task work is pending */ + put_event(child); + } put_ctx(ctx); goto again; } mutex_unlock(&event->child_mutex); - list_for_each_entry_safe(child, tmp, &free_list, child_list) { - list_del(&child->child_list); - /* Last reference unless ->pending_task work is pending */ - put_event(child); - } - no_ctx: /* * Last reference unless ->pending_task work is pending on this event |