diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-03-10 19:03:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 20:03:01 +0100 |
| commit | 6cc3c6e12bb039047974ad2e7e2d46d15a1b762f (patch) | |
| tree | 1c3ff8b51757674ead536a3220c0da14608ee267 /kernel/trace/trace_clock.c | |
| parent | Merge branch 'core/printk' into tracing/ftrace (diff) | |
| download | linux-6cc3c6e12bb039047974ad2e7e2d46d15a1b762f.tar.xz linux-6cc3c6e12bb039047974ad2e7e2d46d15a1b762f.zip | |
trace_clock: fix preemption bug
Using the function_graph tracer in recent kernels generates a spew of
preemption BUGs. Fix this by not requiring trace_clock_local() users
to disable preemption themselves.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_clock.c')
| -rw-r--r-- | kernel/trace/trace_clock.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c index 2d4953f93560..05b176abfd30 100644 --- a/kernel/trace/trace_clock.c +++ b/kernel/trace/trace_clock.c @@ -27,12 +27,19 @@ */ u64 notrace trace_clock_local(void) { + unsigned long flags; + u64 clock; + /* * sched_clock() is an architecture implemented, fast, scalable, * lockless clock. It is not guaranteed to be coherent across * CPUs, nor across CPU idle events. */ - return sched_clock(); + raw_local_irq_save(flags); + clock = sched_clock(); + raw_local_irq_restore(flags); + + return clock; } /* |