---

yaml --- r: 286803 b: refs/heads/master c: 46cd6a7 h: refs/heads/master i: 286801: ebbfab0 286799: 661a875 v: v3
git-mirror · Jan 21, 2012 · 1733174 · 1733174
1 parent f64fd7c
commit 1733174
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd45c15f13e754f3c106427e857310f3e0813951
+refs/heads/master: 46cd6a7f680d14f6f80ede9f04aeb70fa83bd266
diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c
@@ -815,7 +815,7 @@ static void update_event_times(struct perf_event *event)
 	 * here.
 	 */
 	if (is_cgroup_event(event))
-		run_end = perf_event_time(event);
+		run_end = perf_cgroup_event_time(event);
 	else if (ctx->is_active)
 		run_end = ctx->time;
 	else