Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18cef379 authored by Steven Rostedt's avatar Steven Rostedt Committed by Thomas Gleixner
Browse files

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: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 0764d23c

kernel/trace/trace.c

+2 −2
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip) 
	if (unlikely(!tracer_enabled))

		return;



	raw_local_irq_save(flags);

	local_irq_save(flags);

	cpu = raw_smp_processor_id();

	data = tr->data[cpu];

	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);



	atomic_dec(&data->disabled);

	raw_local_irq_restore(flags);

	local_irq_restore(flags);

}



static struct ftrace_ops trace_ops __read_mostly =

kernel/trace/trace_sched_switch.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ctx_switch_func(struct task_struct *prev, struct task_struct *next) 
	if (!tracer_enabled)

		return;



	raw_local_irq_save(flags);

	local_irq_save(flags);

	cpu = raw_smp_processor_id();

	data = tr->data[cpu];

	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);



	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)