diff options
Diffstat (limited to 'kernel/trace/trace_clock.c')
| -rw-r--r-- | kernel/trace/trace_clock.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c index 9d589d8dcd1a..685a67d55db0 100644 --- a/kernel/trace/trace_clock.c +++ b/kernel/trace/trace_clock.c | |||
| @@ -32,16 +32,15 @@ | |||
| 32 | u64 notrace trace_clock_local(void) | 32 | u64 notrace trace_clock_local(void) |
| 33 | { | 33 | { |
| 34 | u64 clock; | 34 | u64 clock; |
| 35 | int resched; | ||
| 36 | 35 | ||
| 37 | /* | 36 | /* |
| 38 | * sched_clock() is an architecture implemented, fast, scalable, | 37 | * sched_clock() is an architecture implemented, fast, scalable, |
| 39 | * lockless clock. It is not guaranteed to be coherent across | 38 | * lockless clock. It is not guaranteed to be coherent across |
| 40 | * CPUs, nor across CPU idle events. | 39 | * CPUs, nor across CPU idle events. |
| 41 | */ | 40 | */ |
| 42 | resched = ftrace_preempt_disable(); | 41 | preempt_disable_notrace(); |
| 43 | clock = sched_clock(); | 42 | clock = sched_clock(); |
| 44 | ftrace_preempt_enable(resched); | 43 | preempt_enable_notrace(); |
| 45 | 44 | ||
| 46 | return clock; | 45 | return clock; |
| 47 | } | 46 | } |
| @@ -56,7 +55,7 @@ u64 notrace trace_clock_local(void) | |||
| 56 | */ | 55 | */ |
| 57 | u64 notrace trace_clock(void) | 56 | u64 notrace trace_clock(void) |
| 58 | { | 57 | { |
| 59 | return cpu_clock(raw_smp_processor_id()); | 58 | return local_clock(); |
| 60 | } | 59 | } |
| 61 | 60 | ||
| 62 | 61 | ||
