lockdep: fix order in trace_hardirqs_off_caller() (73ac74c7) · Commits · 戴 / test

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

kernel/trace/trace_preemptirq.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -102,14 +102,14 @@ NOKPROBE_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);
		NOKPROBE_SYMBOL(trace_hardirqs_off_caller);