diff options
author | Ingo Molnar | 2013-02-03 11:14:06 +0100 |
---|---|---|
committer | Ingo Molnar | 2013-02-03 11:14:06 +0100 |
commit | f7355a5e7c722452e2cd80d6b83acb2f4423c4a2 (patch) | |
tree | 2ee172a5607de2baf25b8e9b99acd181a34676a6 /kernel/trace/trace_clock.c | |
parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | tracing: Init current_trace to nop_trace and remove NULL checks (diff) | |
download | kernel-qcow2-linux-f7355a5e7c722452e2cd80d6b83acb2f4423c4a2.tar.gz kernel-qcow2-linux-f7355a5e7c722452e2cd80d6b83acb2f4423c4a2.tar.xz kernel-qcow2-linux-f7355a5e7c722452e2cd80d6b83acb2f4423c4a2.zip |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updated from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_clock.c')
-rw-r--r-- | kernel/trace/trace_clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c index 22b638b28e48..24bf48eabfcc 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: |