Commit 0d38453c authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

lockdep: Rename trace_softirqs_{on,off}() 



Continue what commit:

  d820ac4c ("locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]")

started, rename these to avoid confusing them with tracepoints.

git grep -l "trace_softirqs_\(on\|off\)" | while read file;
do
	sed -ie 's/trace_softirqs_\(on\|off\)/lockdep_softirqs_\1/g' $file;
done

Reported-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/20200320115859.119434738@infradead.org
parent 2502ec37

include/linux/irqflags.h

+5 −5
Original line number Diff line number Diff line
@@ -15,15 +15,15 @@ 
#include <linux/typecheck.h>

#include <asm/irqflags.h>



/* Currently trace_softirqs_on/off is used only by lockdep */

/* Currently lockdep_softirqs_on/off is used only by lockdep */

#ifdef CONFIG_PROVE_LOCKING

  extern void trace_softirqs_on(unsigned long ip);

  extern void trace_softirqs_off(unsigned long ip);

  extern void lockdep_softirqs_on(unsigned long ip);

  extern void lockdep_softirqs_off(unsigned long ip);

  extern void lockdep_hardirqs_on(unsigned long ip);

  extern void lockdep_hardirqs_off(unsigned long ip);

#else

  static inline void trace_softirqs_on(unsigned long ip) { }

  static inline void trace_softirqs_off(unsigned long ip) { }

  static inline void lockdep_softirqs_on(unsigned long ip) { }

  static inline void lockdep_softirqs_off(unsigned long ip) { }

  static inline void lockdep_hardirqs_on(unsigned long ip) { }

  static inline void lockdep_hardirqs_off(unsigned long ip) { }

#endif

kernel/locking/lockdep.c

+2 −2
Original line number Diff line number Diff line
@@ -3468,7 +3468,7 @@ NOKPROBE_SYMBOL(lockdep_hardirqs_off); 
/*

 * Softirqs will be enabled:

 */

void trace_softirqs_on(unsigned long ip)

void lockdep_softirqs_on(unsigned long ip)

{

	struct task_struct *curr = current;
@@ -3508,7 +3508,7 @@ void trace_softirqs_on(unsigned long ip) 
/*

 * Softirqs were disabled:

 */

void trace_softirqs_off(unsigned long ip)

void lockdep_softirqs_off(unsigned long ip)

{

	struct task_struct *curr = current;

kernel/softirq.c

+3 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void __local_bh_disable_ip(unsigned long ip, unsigned int cnt) 
	 * Were softirqs turned off above:

	 */

	if (softirq_count() == (cnt & SOFTIRQ_MASK))

		trace_softirqs_off(ip);

		lockdep_softirqs_off(ip);

	raw_local_irq_restore(flags);



	if (preempt_count() == cnt) {
@@ -147,7 +147,7 @@ static void __local_bh_enable(unsigned int cnt) 
		trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip());



	if (softirq_count() == (cnt & SOFTIRQ_MASK))

		trace_softirqs_on(_RET_IP_);

		lockdep_softirqs_on(_RET_IP_);



	__preempt_count_sub(cnt);

}
@@ -174,7 +174,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) 
	 * Are softirqs going to be turned on now:

	 */

	if (softirq_count() == SOFTIRQ_DISABLE_OFFSET)

		trace_softirqs_on(ip);

		lockdep_softirqs_on(ip);

	/*

	 * Keep preemption disabled until we are done with

	 * softirq processing:

CRA Git | Maintained and supported by SUSTech CRA and CCSE