From 08dd1582c54f121457d0c115d3c4dcf9bd36620f Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Tue, 22 Nov 2011 16:08:21 +0200
Subject: [PATCH] --- yaml --- r: 276551 b: refs/heads/master c:
 86b47c25494b824da655b95f6fdb4fdb3f17aa77 h: refs/heads/master i:   276549:
 ae6900846c79ea5005326fa0a42ee32a3da20669   276547:
 bc3bf38e6631b1da68318958266674b73bad4f6e   276543:
 c946ee4ab03e6bf3c7b92435aaf65ef29f561e4a v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/events/core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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);