diff --git a/[refs] b/[refs]
index 2a31dbabaeb8..783ef5cc2043 100644
--- 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
index 600c1629b64d..d3b9df5962c2 100644
--- 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);