diff --git a/[refs] b/[refs]
index f64af89724ef..11ef653bec59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e03a9a55b4e45377af9ca3d464135f9ea280b8f8
+refs/heads/master: 64ce312618ef0e11d88def80effcefd1b59fdb1e
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
index c378062da277..cc5d57d1d0b6 100644
--- a/trunk/kernel/events/core.c
+++ b/trunk/kernel/events/core.c
@@ -1120,6 +1120,10 @@ static int __perf_remove_from_context(void *info)
 	raw_spin_lock(&ctx->lock);
 	event_sched_out(event, cpuctx, ctx);
 	list_del_event(event, ctx);
+	if (!ctx->nr_events && cpuctx->task_ctx == ctx) {
+		ctx->is_active = 0;
+		cpuctx->task_ctx = NULL;
+	}
 	raw_spin_unlock(&ctx->lock);
 
 	return 0;