---

yaml --- r: 169748 b: refs/heads/master c: 2e2af50 h: refs/heads/master v: v3
git-mirror · Nov 23, 2009 · b25928c · b25928c
1 parent 0d8de96
commit b25928c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c2bfcbe58e0dd39554be88940149f5aa11e17d1
+refs/heads/master: 2e2af50b1fab3c40636839a7f439c167ae559533
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -294,6 +294,8 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
 	if (event->group_leader != event)
 		event->group_leader->nr_siblings--;
 
+	event->state = PERF_EVENT_STATE_OFF;
+
 	/*
 	 * If this was a group event with sibling events then
 	 * upgrade the siblings to singleton events by adding them