---

yaml --- r: 257023 b: refs/heads/master c: 64ce312 h: refs/heads/master i: 257021: 1e7ce25 257019: ee20f3c 257015: d57b0f6 257007: c55f8dc 256991: 0abe053 256959: 9e7eda2 256895: 4a4774f 256767: e98e0c4 256511: 910d986 255999: 8b6a99d v: v3
git-mirror · May 28, 2011 · a14972c · a14972c
1 parent a16cd8c
commit a14972c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;