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 1723e2b8c58..685a67d55db 100644 --- a/kernel/trace/trace_clock.c +++ b/kernel/trace/trace_clock.c @@ -32,16 +32,15 @@  u64 notrace trace_clock_local(void)  {  	u64 clock; -	int resched;  	/*  	 * sched_clock() is an architecture implemented, fast, scalable,  	 * lockless clock. It is not guaranteed to be coherent across  	 * CPUs, nor across CPU idle events.  	 */ -	resched = ftrace_preempt_disable(); +	preempt_disable_notrace();  	clock = sched_clock(); -	ftrace_preempt_enable(resched); +	preempt_enable_notrace();  	return clock;  }  |