summaryrefslogtreecommitdiffstats
path: root/kernel/perf_event.c
diff options
context:
space:
mode:
authorPeter Zijlstra2009-11-23 11:37:24 +0100
committerIngo Molnar2009-11-23 11:49:55 +0100
commit6c2bfcbe58e0dd39554be88940149f5aa11e17d1 (patch)
tree05b8246173a23f418c2b724d111c37a6429e426d /kernel/perf_event.c
parentperf_events: Undo copy/paste damage (diff)
downloadkernel-qcow2-linux-6c2bfcbe58e0dd39554be88940149f5aa11e17d1.tar.gz
kernel-qcow2-linux-6c2bfcbe58e0dd39554be88940149f5aa11e17d1.tar.xz
kernel-qcow2-linux-6c2bfcbe58e0dd39554be88940149f5aa11e17d1.zip
perf_events: Fix style nits
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> LKML-Reference: <20091123103819.613427378@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_event.c')
-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:
* 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);