---

yaml --- r: 169721 b: refs/heads/master c: 3dbebf1 h: refs/heads/master i: 169719: 655bc99 v: v3
git-mirror · Nov 21, 2009 · 327b65d · 327b65d
1 parent fd0f4e2
commit 327b65d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6f83785222b0ee037f7be90731f62a649292b5e
+refs/heads/master: 3dbebf15c5d3e265f751eec72c1538a00da4be27
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -1061,8 +1061,6 @@ static int context_equiv(struct perf_event_context *ctx1,
 		&& !ctx1->pin_count && !ctx2->pin_count;
 }
 
-static void __perf_event_read(void *event);
-
 static void __perf_event_sync_stat(struct perf_event *event,
 				     struct perf_event *next_event)
 {
@@ -1080,8 +1078,8 @@ static void __perf_event_sync_stat(struct perf_event *event,
 	 */
 	switch (event->state) {
 	case PERF_EVENT_STATE_ACTIVE:
-		__perf_event_read(event);
-		break;
+		event->pmu->read(event);
+		/* fall-through */
 
 	case PERF_EVENT_STATE_INACTIVE:
 		update_event_times(event);