aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_event.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index e2daa10bb5ce..1f14481c2337 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -447,9 +447,8 @@ retry:
447 * can remove the event safely, if the call above did not 447 * can remove the event safely, if the call above did not
448 * succeed. 448 * succeed.
449 */ 449 */
450 if (!list_empty(&event->group_entry)) { 450 if (!list_empty(&event->group_entry))
451 list_del_event(event, ctx); 451 list_del_event(event, ctx);
452 }
453 spin_unlock_irq(&ctx->lock); 452 spin_unlock_irq(&ctx->lock);
454} 453}
455 454
@@ -1033,10 +1032,10 @@ void __perf_event_sched_out(struct perf_event_context *ctx,
1033 update_context_time(ctx); 1032 update_context_time(ctx);
1034 1033
1035 perf_disable(); 1034 perf_disable();
1036 if (ctx->nr_active) 1035 if (ctx->nr_active) {
1037 list_for_each_entry(event, &ctx->group_list, group_entry) 1036 list_for_each_entry(event, &ctx->group_list, group_entry)
1038 group_sched_out(event, cpuctx, ctx); 1037 group_sched_out(event, cpuctx, ctx);
1039 1038 }
1040 perf_enable(); 1039 perf_enable();
1041 out: 1040 out:
1042 spin_unlock(&ctx->lock); 1041 spin_unlock(&ctx->lock);