aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/trace/trace_clock.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
index 2d4953f9356..05b176abfd3 100644
--- a/kernel/trace/trace_clock.c
+++ b/kernel/trace/trace_clock.c
@@ -27,12 +27,19 @@
27 */ 27 */
28u64 notrace trace_clock_local(void) 28u64 notrace trace_clock_local(void)
29{ 29{
30 unsigned long flags;
31 u64 clock;
32
30 /* 33 /*
31 * sched_clock() is an architecture implemented, fast, scalable, 34 * sched_clock() is an architecture implemented, fast, scalable,
32 * lockless clock. It is not guaranteed to be coherent across 35 * lockless clock. It is not guaranteed to be coherent across
33 * CPUs, nor across CPU idle events. 36 * CPUs, nor across CPU idle events.
34 */ 37 */
35 return sched_clock(); 38 raw_local_irq_save(flags);
39 clock = sched_clock();
40 raw_local_irq_restore(flags);
41
42 return clock;
36} 43}
37 44
38/* 45/*