diff options
| author |   Steven Rostedt <srostedt@redhat.com> | 2008-11-15 15:48:29 -0500 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-11-16 07:35:37 +0100 |
| commit | d51ad7ac48f991c4a8834485727efa99a691cb87 (patch) | |
| tree | 7491150df5bda0b3c04e5a7f1fafdb35f3aec5c4 /kernel/trace/trace.c | |
| parent | ftrace: do not process freed records (diff) | |
| download | linux-dev-d51ad7ac48f991c4a8834485727efa99a691cb87.tar.xz linux-dev-d51ad7ac48f991c4a8834485727efa99a691cb87.zip | |
ftrace: replace raw_local_irq_save with local_irq_save
Impact: fix lockdep disabling itself when function tracing is enabled
The raw_local_irq_saves used in ftrace is causing problems with
lockdep. (it thinks the irq flags are out of sync and disables
itself with a warning)
The raw ops here are not needed, and the normal local_irq_save is fine.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 4a904623e05d..dff4bee591b9 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1051,7 +1051,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip) * Need to use raw, since this must be called before the * recursive protection is performed. */ - raw_local_irq_save(flags); + local_irq_save(flags); cpu = raw_smp_processor_id(); data = tr->data[cpu]; disabled = atomic_inc_return(&data->disabled); @@ -1062,7 +1062,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip) } atomic_dec(&data->disabled); - raw_local_irq_restore(flags); + local_irq_restore(flags); } #ifdef CONFIG_FUNCTION_RET_TRACER |