lockdep: fix order in trace_hardirqs_off_caller()
[ Upstream commit 73ac74c7d4
]
Switch order so that locking state is consistent even
if the IRQ tracer calls into lockdep again.
Acked-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
43d750a099
commit
c7be1f4d4e
|
@ -63,14 +63,14 @@ NOKPROBE_SYMBOL(trace_hardirqs_on_caller);
|
||||||
|
|
||||||
__visible void trace_hardirqs_off_caller(unsigned long caller_addr)
|
__visible void trace_hardirqs_off_caller(unsigned long caller_addr)
|
||||||
{
|
{
|
||||||
|
lockdep_hardirqs_off(CALLER_ADDR0);
|
||||||
|
|
||||||
if (!this_cpu_read(tracing_irq_cpu)) {
|
if (!this_cpu_read(tracing_irq_cpu)) {
|
||||||
this_cpu_write(tracing_irq_cpu, 1);
|
this_cpu_write(tracing_irq_cpu, 1);
|
||||||
tracer_hardirqs_off(CALLER_ADDR0, caller_addr);
|
tracer_hardirqs_off(CALLER_ADDR0, caller_addr);
|
||||||
if (!in_nmi())
|
if (!in_nmi())
|
||||||
trace_irq_disable_rcuidle(CALLER_ADDR0, caller_addr);
|
trace_irq_disable_rcuidle(CALLER_ADDR0, caller_addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
lockdep_hardirqs_off(CALLER_ADDR0);
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(trace_hardirqs_off_caller);
|
EXPORT_SYMBOL(trace_hardirqs_off_caller);
|
||||||
NOKPROBE_SYMBOL(trace_hardirqs_off_caller);
|
NOKPROBE_SYMBOL(trace_hardirqs_off_caller);
|
||||||
|
|
Loading…
Reference in New Issue