From: Namhyung Kim Date: Thu, 27 Dec 2012 02:49:45 +0000 (+0900) Subject: tracing: Use sched_clock_cpu for trace_clock_global X-Git-Tag: v3.9-rc1~173^2~10^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e67b51e3fb22ad43faf9589e9019ad9c6a00413;p=platform%2Fkernel%2Flinux-exynos.git tracing: Use sched_clock_cpu for trace_clock_global For systems with an unstable sched_clock, all cpu_clock() does is enable/ disable local irq during the call to sched_clock_cpu(). And for stable systems they are same. trace_clock_global() already disables interrupts, so it can call sched_clock_cpu() directly. Link: http://lkml.kernel.org/r/1356576585-28782-2-git-send-email-namhyung@kernel.org Signed-off-by: Namhyung Kim Signed-off-by: Steven Rostedt --- diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c index 22b638b..24bf48e 100644 --- a/kernel/trace/trace_clock.c +++ b/kernel/trace/trace_clock.c @@ -84,7 +84,7 @@ u64 notrace trace_clock_global(void) local_irq_save(flags); this_cpu = raw_smp_processor_id(); - now = cpu_clock(this_cpu); + now = sched_clock_cpu(this_cpu); /* * If in an NMI context then dont risk lockups and return the * cpu_clock() time: