Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ftrace: don't use raw_local_irq_save/restore

Browse source 
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>
This commit is contained in:
Steven Rostedt 2008-05-12 21:20:44 +02:00 committed by Thomas Gleixner
parent 0764d23cf0
commit 18cef379d3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/trace/trace.c
View file

@ -269,7 +269,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
if (unlikely(!tracer_enabled)) if (unlikely(!tracer_enabled))
return; return;
raw_local_irq_save(flags); local_irq_save(flags);
cpu = raw_smp_processor_id(); cpu = raw_smp_processor_id();
data = tr->data[cpu]; data = tr->data[cpu];
disabled = atomic_inc_return(&data->disabled); disabled = atomic_inc_return(&data->disabled);
@ -278,7 +278,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
ftrace(tr, data, ip, parent_ip, flags); ftrace(tr, data, ip, parent_ip, flags);
atomic_dec(&data->disabled); atomic_dec(&data->disabled);
raw_local_irq_restore(flags); local_irq_restore(flags);
} }
static struct ftrace_ops trace_ops __read_mostly = static struct ftrace_ops trace_ops __read_mostly =

4
kernel/trace/trace_sched_switch.c
View file

@ -29,7 +29,7 @@ ctx_switch_func(struct task_struct *prev, struct task_struct *next)
if (!tracer_enabled) if (!tracer_enabled)
return; return;
raw_local_irq_save(flags); local_irq_save(flags);
cpu = raw_smp_processor_id(); cpu = raw_smp_processor_id();
data = tr->data[cpu]; data = tr->data[cpu];
disabled = atomic_inc_return(&data->disabled); disabled = atomic_inc_return(&data->disabled);
@ -38,7 +38,7 @@ ctx_switch_func(struct task_struct *prev, struct task_struct *next)
tracing_sched_switch_trace(tr, data, prev, next, flags); tracing_sched_switch_trace(tr, data, prev, next, flags);
atomic_dec(&data->disabled); atomic_dec(&data->disabled);
raw_local_irq_restore(flags); local_irq_restore(flags);
} }
void ftrace_ctx_switch(struct task_struct *prev, struct task_struct *next) void ftrace_ctx_switch(struct task_struct *prev, struct task_struct *next)