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

Commit aafa75ff authored by Sven Schnelle's avatar Sven Schnelle Committed by Greg Kroah-Hartman
Browse files

lockdep: fix order in trace_hardirqs_off_caller() 



[ Upstream commit 73ac74c7d489756d2313219a108809921dbfaea1 ]

Switch order so that locking state is consistent even
if the IRQ tracer calls into lockdep again.

Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarSven Schnelle <svens@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b0800562

kernel/trace/trace_preemptirq.c

+2 −2
Original line number Diff line number Diff line
@@ -59,14 +59,14 @@ EXPORT_SYMBOL(trace_hardirqs_on_caller); 


__visible void trace_hardirqs_off_caller(unsigned long caller_addr)

{

	lockdep_hardirqs_off(CALLER_ADDR0);



	if (!this_cpu_read(tracing_irq_cpu)) {

		this_cpu_write(tracing_irq_cpu, 1);

		tracer_hardirqs_off(CALLER_ADDR0, caller_addr);

		if (!in_nmi())

			trace_irq_disable_rcuidle(CALLER_ADDR0, caller_addr);

	}



	lockdep_hardirqs_off(CALLER_ADDR0);

}

EXPORT_SYMBOL(trace_hardirqs_off_caller);

#endif /* CONFIG_TRACE_IRQFLAGS */