aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-12 15:21:14 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 10:02:23 -0400
commitc6531cce6e6e4b99bcda46b6268d6f2d9e30aea4 (patch)
tree89d2d4d91dc9223daac91bec7970beaab2ebc1b1 /kernel
parent677aa9f77e8de3791b481a0cec6c8b84d1eec626 (diff)
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index e2e985eeee78..6590a828138f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -884,12 +884,12 @@ static unsigned long long __cpu_clock(int cpu)
884 * For kernel-internal use: high-speed (but slightly incorrect) per-cpu 884 * For kernel-internal use: high-speed (but slightly incorrect) per-cpu
885 * clock constructed from sched_clock(): 885 * clock constructed from sched_clock():
886 */ 886 */
887unsigned long long cpu_clock(int cpu) 887unsigned long long notrace cpu_clock(int cpu)
888{ 888{
889 unsigned long long prev_cpu_time, time, delta_time; 889 unsigned long long prev_cpu_time, time, delta_time;
890 unsigned long flags; 890 unsigned long flags;
891 891
892 local_irq_save(flags); 892 raw_local_irq_save(flags);
893 prev_cpu_time = per_cpu(prev_cpu_time, cpu); 893 prev_cpu_time = per_cpu(prev_cpu_time, cpu);
894 time = __cpu_clock(cpu) + per_cpu(time_offset, cpu); 894 time = __cpu_clock(cpu) + per_cpu(time_offset, cpu);
895 delta_time = time-prev_cpu_time; 895 delta_time = time-prev_cpu_time;
@@ -898,7 +898,7 @@ unsigned long long cpu_clock(int cpu)
898 time = __sync_cpu_clock(time, cpu); 898 time = __sync_cpu_clock(time, cpu);
899 per_cpu(prev_cpu_time, cpu) = time; 899 per_cpu(prev_cpu_time, cpu) = time;
900 } 900 }
901 local_irq_restore(flags); 901 raw_local_irq_restore(flags);
902 902
903 return time; 903 return time;
904} 904}