|
@@ -884,12 +884,12 @@ static unsigned long long __cpu_clock(int cpu)
|
|
|
* For kernel-internal use: high-speed (but slightly incorrect) per-cpu
|
|
|
* clock constructed from sched_clock():
|
|
|
*/
|
|
|
-unsigned long long cpu_clock(int cpu)
|
|
|
+unsigned long long notrace cpu_clock(int cpu)
|
|
|
{
|
|
|
unsigned long long prev_cpu_time, time, delta_time;
|
|
|
unsigned long flags;
|
|
|
|
|
|
- local_irq_save(flags);
|
|
|
+ raw_local_irq_save(flags);
|
|
|
prev_cpu_time = per_cpu(prev_cpu_time, cpu);
|
|
|
time = __cpu_clock(cpu) + per_cpu(time_offset, cpu);
|
|
|
delta_time = time-prev_cpu_time;
|
|
@@ -898,7 +898,7 @@ unsigned long long cpu_clock(int cpu)
|
|
|
time = __sync_cpu_clock(time, cpu);
|
|
|
per_cpu(prev_cpu_time, cpu) = time;
|
|
|
}
|
|
|
- local_irq_restore(flags);
|
|
|
+ raw_local_irq_restore(flags);
|
|
|
|
|
|
return time;
|
|
|
}
|