summaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-01-20 10:12:46 +0900
committerIngo Molnar <mingo@elte.hu>2012-01-21 09:33:42 +0100
commit46cd6a7f680d14f6f80ede9f04aeb70fa83bd266 (patch)
tree57d32e7f7399af2c3c869ec685e2050f6cf08d70 /kernel/events
parentfd45c15f13e754f3c106427e857310f3e0813951 (diff)
downloadop-kernel-dev-46cd6a7f680d14f6f80ede9f04aeb70fa83bd266.zip
op-kernel-dev-46cd6a7f680d14f6f80ede9f04aeb70fa83bd266.tar.gz
perf: Call perf_cgroup_event_time() directly
The perf_event_time() will call perf_cgroup_event_time() if @event is a cgroup event. Just do it directly and avoid the extra check.. Signed-off-by: Namhyung Kim <namhyung.kim@lge.com> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Link: http://lkml.kernel.org/r/1327021966-27688-2-git-send-email-namhyung.kim@lge.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index a8f4ac0..32b48c8 100644
--- a/kernel/events/core.c
+++ b/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
OpenPOWER on IntegriCloud