X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fsched%2Fclock.c;fp=kernel%2Fsched%2Fclock.c;h=b30a2924ef1429a60152a40101ec4828c5e23268;hb=59bf6c3c6c1e8463234015ae7690f5cdd991dffe;hp=43c2bcc35761e40c9342522b4fa87b92cdefd8f4;hpb=b44eeb4d47b2a7e3e3494fff126b66338b360ce3;p=~andy%2Flinux

diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c
index 43c2bcc3576..b30a2924ef1 100644
--- a/kernel/sched/clock.c
+++ b/kernel/sched/clock.c
@@ -301,14 +301,14 @@ u64 sched_clock_cpu(int cpu)
 	if (unlikely(!sched_clock_running))
 		return 0ull;
 
-	preempt_disable();
+	preempt_disable_notrace();
 	scd = cpu_sdc(cpu);
 
 	if (cpu != smp_processor_id())
 		clock = sched_clock_remote(scd);
 	else
 		clock = sched_clock_local(scd);
-	preempt_enable();
+	preempt_enable_notrace();
 
 	return clock;
 }