From ab80c418e4ed34cfddec8499bb9882d3671da3e7 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Sat, 23 May 2009 18:28:59 +0200 Subject: [PATCH] --- yaml --- r: 147490 b: refs/heads/master c: aa9c67f53d1969cf1db4c9c2db3a78c4ceb96469 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/perf_counter.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6f30a7a9ca83..0f1f346bb54b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a482f38c5aafeb3576079a38a5b21b46619f3d2 +refs/heads/master: aa9c67f53d1969cf1db4c9c2db3a78c4ceb96469 diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index d162d2f0b270..0e97f8961333 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/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; /*