aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-05-23 18:28:59 +0200
committerIngo Molnar <mingo@elte.hu>2009-05-23 19:37:47 +0200
commitaa9c67f53d1969cf1db4c9c2db3a78c4ceb96469 (patch)
tree7f2d3face393454dc58a6e811bb294714db948a6 /kernel
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')
-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 d162d2f0b27..0e97f896133 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -3416,10 +3416,7 @@ __perf_counter_exit_task(struct task_struct *child,
struct perf_counter *parent_counter;
update_counter_times(child_counter);
-
- spin_lock_irq(&child_ctx->lock);
- list_del_counter(child_counter, child_ctx);
- spin_unlock_irq(&child_ctx->lock);
+ perf_counter_remove_from_context(child_counter);
parent_counter = child_counter->parent;
/*