diff options
Diffstat (limited to 'kernel/trace/trace_clock.c')
-rw-r--r-- | kernel/trace/trace_clock.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c index 394783531cbb..aa8f5f48dae6 100644 --- a/kernel/trace/trace_clock.c +++ b/kernel/trace/trace_clock.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include <linux/ktime.h> | 21 | #include <linux/ktime.h> |
22 | #include <linux/trace_clock.h> | 22 | #include <linux/trace_clock.h> |
23 | 23 | ||
24 | #include "trace.h" | ||
25 | |||
26 | /* | 24 | /* |
27 | * trace_clock_local(): the simplest and least coherent tracing clock. | 25 | * trace_clock_local(): the simplest and least coherent tracing clock. |
28 | * | 26 | * |
@@ -44,6 +42,7 @@ u64 notrace trace_clock_local(void) | |||
44 | 42 | ||
45 | return clock; | 43 | return clock; |
46 | } | 44 | } |
45 | EXPORT_SYMBOL_GPL(trace_clock_local); | ||
47 | 46 | ||
48 | /* | 47 | /* |
49 | * trace_clock(): 'between' trace clock. Not completely serialized, | 48 | * trace_clock(): 'between' trace clock. Not completely serialized, |
@@ -86,7 +85,7 @@ u64 notrace trace_clock_global(void) | |||
86 | local_irq_save(flags); | 85 | local_irq_save(flags); |
87 | 86 | ||
88 | this_cpu = raw_smp_processor_id(); | 87 | this_cpu = raw_smp_processor_id(); |
89 | now = cpu_clock(this_cpu); | 88 | now = sched_clock_cpu(this_cpu); |
90 | /* | 89 | /* |
91 | * If in an NMI context then dont risk lockups and return the | 90 | * If in an NMI context then dont risk lockups and return the |
92 | * cpu_clock() time: | 91 | * cpu_clock() time: |