sched: do not trace sched_clock

The tracer uses sched_clock, so do not trace it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/kernel/sched.c b/kernel/sched.c
index e2e985eeee786298dac18e899d6e043a206b43a5..6590a828138fe96a51db002c9f8d4f50dd5d2eae 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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;
 }