Commit-ID: 46cd6a7f680d14f6f80ede9f04aeb70fa83bd266 Gitweb: http://git.kernel.org/tip/46cd6a7f680d14f6f80ede9f04aeb70fa83bd266 Author: Namhyung Kim <namhyung.kim@xxxxxxx> AuthorDate: Fri, 20 Jan 2012 10:12:46 +0900 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Sat, 21 Jan 2012 09:33:42 +0100 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@xxxxxxx> Cc: Namhyung Kim <namhyung@xxxxxxxxx> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxxxx> Link: http://lkml.kernel.org/r/1327021966-27688-2-git-send-email-namhyung.kim@xxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- kernel/events/core.c | 2 +- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|