diff --git a/[refs] b/[refs]
index f3ad7235a004..1db12f21fc14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f4dee227348daac32f36daad9a91059efd0723e
+refs/heads/master: 012b84dae17126d8b5d159173091eb3db5a2bc43
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
index eb346048f00f..616c52426b32 100644
--- a/trunk/kernel/perf_counter.c
+++ b/trunk/kernel/perf_counter.c
@@ -1004,6 +1004,10 @@ static void __perf_counter_task_sched_out(struct perf_counter_context *ctx)
 
 	if (!cpuctx->task_ctx)
 		return;
+
+	if (WARN_ON_ONCE(ctx != cpuctx->task_ctx))
+		return;
+
 	__perf_counter_sched_out(ctx, cpuctx);
 	cpuctx->task_ctx = NULL;
 }