From 173317404c0789e5213ce9c2833b8e7441c9ce64 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Fri, 20 Jan 2012 10:12:46 +0900 Subject: [PATCH] --- yaml --- r: 286803 b: refs/heads/master c: 46cd6a7f680d14f6f80ede9f04aeb70fa83bd266 h: refs/heads/master i: 286801: ebbfab0b95868ba61056aadcb1f8b06390529818 286799: 661a8752a501027f8e7cfe775bbd2c1285a022b4 v: v3 --- [refs] | 2 +- trunk/kernel/events/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 428e9e0e9893..137c36620a8a 100644 --- 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 index a8f4ac001a00..32b48c889711 100644 --- 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