summaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-04-09 21:17:48 +0200
committerIngo Molnar <mingo@elte.hu>2011-05-28 18:01:23 +0200
commit64ce312618ef0e11d88def80effcefd1b59fdb1e (patch)
tree884c247a013b8d13fa7a1f90dfa5bc01e16d62d6 /kernel/events
parente03a9a55b4e45377af9ca3d464135f9ea280b8f8 (diff)
downloadblackbird-op-linux-64ce312618ef0e11d88def80effcefd1b59fdb1e.tar.gz
blackbird-op-linux-64ce312618ef0e11d88def80effcefd1b59fdb1e.zip
perf: De-schedule a task context when removing the last event
Since perf_install_in_context() will now install a context when we add the first event, we can de-schedule the context when the last event is removed. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20110409192142.090431763@chello.nl Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index c378062da277..cc5d57d1d0b6 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1120,6 +1120,10 @@ static int __perf_remove_from_context(void *info)
raw_spin_lock(&ctx->lock);
event_sched_out(event, cpuctx, ctx);
list_del_event(event, ctx);
+ if (!ctx->nr_events && cpuctx->task_ctx == ctx) {
+ ctx->is_active = 0;
+ cpuctx->task_ctx = NULL;
+ }
raw_spin_unlock(&ctx->lock);
return 0;
OpenPOWER on IntegriCloud