diff options
author | Steven Rostedt <rostedt@goodmis.org> | 2008-05-12 15:20:44 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-23 14:40:05 -0400 |
commit | 18cef379d30f5ded20cc31d7f2d342639d39919d (patch) | |
tree | cd193ad51e39cf0987ef815a6ef0cd1017e075ee /kernel/trace/trace.c | |
parent | 0764d23cf066c52de42b653144605b481d3fbdbc (diff) |
ftrace: don't use raw_local_irq_save/restore
Using raw_local_irq_save/restore confuses lockdep.
It's fine to use the normal ones.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index d7ad030a4c49..9175ce91b8f6 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -269,7 +269,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip) | |||
269 | if (unlikely(!tracer_enabled)) | 269 | if (unlikely(!tracer_enabled)) |
270 | return; | 270 | return; |
271 | 271 | ||
272 | raw_local_irq_save(flags); | 272 | local_irq_save(flags); |
273 | cpu = raw_smp_processor_id(); | 273 | cpu = raw_smp_processor_id(); |
274 | data = tr->data[cpu]; | 274 | data = tr->data[cpu]; |
275 | disabled = atomic_inc_return(&data->disabled); | 275 | disabled = atomic_inc_return(&data->disabled); |
@@ -278,7 +278,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip) | |||
278 | ftrace(tr, data, ip, parent_ip, flags); | 278 | ftrace(tr, data, ip, parent_ip, flags); |
279 | 279 | ||
280 | atomic_dec(&data->disabled); | 280 | atomic_dec(&data->disabled); |
281 | raw_local_irq_restore(flags); | 281 | local_irq_restore(flags); |
282 | } | 282 | } |
283 | 283 | ||
284 | static struct ftrace_ops trace_ops __read_mostly = | 284 | static struct ftrace_ops trace_ops __read_mostly = |