aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/perf_counter.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-05-23 12:28:59 -0400
committerIngo Molnar <mingo@elte.hu>2009-05-23 13:37:47 -0400
commitaa9c67f53d1969cf1db4c9c2db3a78c4ceb96469 (patch)
tree7f2d3face393454dc58a6e811bb294714db948a6 /kernel/perf_counter.c
parent1a482f38c5aafeb3576079a38a5b21b46619f3d2 (diff)
perf_counter: Simplify context cleanup
Use perf_counter_remove_from_context() to remove counters from the context. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: John Kacur <jkacur@redhat.com> LKML-Reference: <20090523163012.796275849@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_counter.c')
-rw-r--r--kernel/perf_counter.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index d162d2f0b270..0e97f8961333 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -3416,10 +3416,7 @@ __perf_counter_exit_task(struct task_struct *child,
3416 struct perf_counter *parent_counter; 3416 struct perf_counter *parent_counter;
3417 3417
3418 update_counter_times(child_counter); 3418 update_counter_times(child_counter);
3419 3419 perf_counter_remove_from_context(child_counter);
3420 spin_lock_irq(&child_ctx->lock);
3421 list_del_counter(child_counter, child_ctx);
3422 spin_unlock_irq(&child_ctx->lock);
3423 3420
3424 parent_counter = child_counter->parent; 3421 parent_counter = child_counter->parent;
3425 /* 3422 /*