---

yaml --- r: 169808 b: refs/heads/master c: b2e74a2 h: refs/heads/master v: v3
git-mirror · Nov 26, 2009 · 2e8d5d9 · 2e8d5d9
1 parent 08dc771
commit 2e8d5d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d795fb17a02a87e35782773b88b7a63acfbeaae
+refs/heads/master: b2e74a265ded1a185f762ebaab967e9e0d008dd8
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -338,7 +338,16 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
 		event->group_leader->nr_siblings--;
 
 	update_event_times(event);
-	event->state = PERF_EVENT_STATE_OFF;
+
+	/*
+	 * If event was in error state, then keep it
+	 * that way, otherwise bogus counts will be
+	 * returned on read(). The only way to get out
+	 * of error state is by explicit re-enabling
+	 * of the event
+	 */
+	if (event->state > PERF_EVENT_STATE_OFF)
+		event->state = PERF_EVENT_STATE_OFF;
 
 	/*
 	 * If this was a group event with sibling events then