From 06033d62beded9f41aae6420e628a519e7ebea37 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Fri, 15 Mar 2013 16:27:13 +0900
Subject: [PATCH] --- yaml --- r: 361556 b: refs/heads/master c:
 d610d98b5de6860feb21539726e9af7c9094151c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c6dde39cb402..bbd20242294b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778141e3cf0bf29f91cd3cb5c314ea477b9402a7
+refs/heads/master: d610d98b5de6860feb21539726e9af7c9094151c
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
index fa79c377d65d..59412d037eed 100644
--- a/trunk/kernel/events/core.c
+++ b/trunk/kernel/events/core.c
@@ -4434,12 +4434,15 @@ static void perf_event_task_event(struct perf_task_event *task_event)
 			if (ctxn < 0)
 				goto next;
 			ctx = rcu_dereference(current->perf_event_ctxp[ctxn]);
+			if (ctx)
+				perf_event_task_ctx(ctx, task_event);
 		}
-		if (ctx)
-			perf_event_task_ctx(ctx, task_event);
 next:
 		put_cpu_ptr(pmu->pmu_cpu_context);
 	}
+	if (task_event->task_ctx)
+		perf_event_task_ctx(task_event->task_ctx, task_event);
+
 	rcu_read_unlock();
 }