summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2011-10-23 19:10:33 +0200
committerIngo Molnar <mingo@elte.hu>2011-11-14 13:01:21 +0100
commit1d5f003f5a964711853514b04ddc872eec0fdc7b (patch)
tree6f3e912a02b50dc698f601c3a08453a781e7f754 /kernel
parent57d1c0c03c6b48b2b96870d831b9ce6b917f53ac (diff)
perf: Do not set task_ctx pointer in cpuctx if there are no events in the context
Do not set task_ctx pointer during sched_in if there are no events associated with the context. Otherwise if during task execution total number of events in the system will become zero perf_event_context_sched_out() will not be called and cpuctx->task_ctx will be left with a stale value. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20111023171033.GI17571@redhat.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 0e8457da6f95..b0c1186fd97b 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2173,7 +2173,8 @@ static void perf_event_context_sched_in(struct perf_event_context *ctx,
perf_event_sched_in(cpuctx, ctx, task);
- cpuctx->task_ctx = ctx;
+ if (ctx->nr_events)
+ cpuctx->task_ctx = ctx;
perf_pmu_enable(ctx->pmu);
perf_ctx_unlock(cpuctx, ctx);