---

yaml --- r: 276551 b: refs/heads/master c: 86b47c2 h: refs/heads/master i: 276549: ae69008 276547: bc3bf38 276543: c946ee4 v: v3
git-mirror · Dec 7, 2011 · 08dd158 · 08dd158
1 parent 0216f2b
commit 08dd158
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a33caeb118198286309859f014c0662f3ed54ed4
+refs/heads/master: 86b47c25494b824da655b95f6fdb4fdb3f17aa77
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
@@ -2174,11 +2174,11 @@ static void perf_event_context_sched_in(struct perf_event_context *ctx,
 	 */
 	cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE);
 
-	perf_event_sched_in(cpuctx, ctx, task);
-
 	if (ctx->nr_events)
 		cpuctx->task_ctx = ctx;
 
+	perf_event_sched_in(cpuctx, cpuctx->task_ctx, task);
+
 	perf_pmu_enable(ctx->pmu);
 	perf_ctx_unlock(cpuctx, ctx);