From 3f2754803849e644cc31e4755c25585d16370ede Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Sun, 23 Oct 2011 19:10:33 +0200 Subject: [PATCH] --- yaml --- r: 276381 b: refs/heads/master c: 1d5f003f5a964711853514b04ddc872eec0fdc7b h: refs/heads/master i: 276379: fe089a22c40a4f753d9f72191e31b48c929b7c3f v: v3 --- [refs] | 2 +- trunk/kernel/events/core.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 33d14f942579..441cb63c2e63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57d1c0c03c6b48b2b96870d831b9ce6b917f53ac +refs/heads/master: 1d5f003f5a964711853514b04ddc872eec0fdc7b diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c index 0e8457da6f95..b0c1186fd97b 100644 --- a/trunk/kernel/events/core.c +++ b/trunk/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);