From 0d8de96f12b72831047bf8e25e91b05c53a7c475 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 23 Nov 2009 11:37:24 +0100 Subject: [PATCH] --- yaml --- r: 169747 b: refs/heads/master c: 6c2bfcbe58e0dd39554be88940149f5aa11e17d1 h: refs/heads/master i: 169745: 4a8c1edd1fad1337f903ba95816e0d836ec90886 169743: c81cc149abf402548eded61c5e83b4a30475a710 v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2310b2a25bc3..8fff2bef7cd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a66a3052e2d4c5815d7ad26887b1d4193206e691 +refs/heads/master: 6c2bfcbe58e0dd39554be88940149f5aa11e17d1 diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index e2daa10bb5ce..1f14481c2337 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -447,9 +447,8 @@ static void perf_event_remove_from_context(struct perf_event *event) * can remove the event safely, if the call above did not * succeed. */ - if (!list_empty(&event->group_entry)) { + if (!list_empty(&event->group_entry)) list_del_event(event, ctx); - } spin_unlock_irq(&ctx->lock); } @@ -1033,10 +1032,10 @@ void __perf_event_sched_out(struct perf_event_context *ctx, update_context_time(ctx); perf_disable(); - if (ctx->nr_active) + if (ctx->nr_active) { list_for_each_entry(event, &ctx->group_list, group_entry) group_sched_out(event, cpuctx, ctx); - + } perf_enable(); out: spin_unlock(&ctx->lock);