diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-12 21:21:14 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-25 16:02:23 +0200 |
| commit | c6531cce6e6e4b99bcda46b6268d6f2d9e30aea4 (patch) | |
| tree | 89d2d4d91dc9223daac91bec7970beaab2ebc1b1 /kernel/sched.c | |
| parent | 677aa9f77e8de3791b481a0cec6c8b84d1eec626 (diff) | |
| download | op-kernel-dev-c6531cce6e6e4b99bcda46b6268d6f2d9e30aea4.zip op-kernel-dev-c6531cce6e6e4b99bcda46b6268d6f2d9e30aea4.tar.gz | |
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/sched.c')
| -rw-r--r-- | kernel/sched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index e2e985e..6590a82 100644 --- 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; } |
