leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lockdep: Rename trace_softirqs_{on,off}()

Browse Source 
Continue what commit:

  d820ac4c2f ("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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/r/20200320115859.119434738@infradead.org
This commit is contained in:
Peter Zijlstra 2020-03-20 12:56:41 +01:00 committed by Thomas Gleixner
parent 2502ec37a7
commit 0d38453c85
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/irqflags.h
View File

@ -15,15 +15,15 @@
#include <linux/typecheck.h> #include <linux/typecheck.h>
#include <asm/irqflags.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 #ifdef CONFIG_PROVE_LOCKING
extern void trace_softirqs_on(unsigned long ip); extern void lockdep_softirqs_on(unsigned long ip);
extern void trace_softirqs_off(unsigned long ip); extern void lockdep_softirqs_off(unsigned long ip);
extern void lockdep_hardirqs_on(unsigned long ip); extern void lockdep_hardirqs_on(unsigned long ip);
extern void lockdep_hardirqs_off(unsigned long ip); extern void lockdep_hardirqs_off(unsigned long ip);
#else #else
static inline void trace_softirqs_on(unsigned long ip) { } static inline void lockdep_softirqs_on(unsigned long ip) { }
static inline void trace_softirqs_off(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_on(unsigned long ip) { }
static inline void lockdep_hardirqs_off(unsigned long ip) { } static inline void lockdep_hardirqs_off(unsigned long ip) { }
#endif #endif

4
kernel/locking/lockdep.c
View File

@ -3468,7 +3468,7 @@ NOKPROBE_SYMBOL(lockdep_hardirqs_off);
/* /*
* Softirqs will be enabled: * Softirqs will be enabled:
*/ */
void trace_softirqs_on(unsigned long ip) void lockdep_softirqs_on(unsigned long ip)
{ {
struct task_struct *curr = current; struct task_struct *curr = current;
@ -3508,7 +3508,7 @@ void trace_softirqs_on(unsigned long ip)
/* /*
* Softirqs were disabled: * Softirqs were disabled:
*/ */
void trace_softirqs_off(unsigned long ip) void lockdep_softirqs_off(unsigned long ip)
{ {
struct task_struct *curr = current; struct task_struct *curr = current;

6
kernel/softirq.c
View File

@ -126,7 +126,7 @@ void __local_bh_disable_ip(unsigned long ip, unsigned int cnt)
* Were softirqs turned off above: * Were softirqs turned off above:
*/ */
if (softirq_count() == (cnt & SOFTIRQ_MASK)) if (softirq_count() == (cnt & SOFTIRQ_MASK))
trace_softirqs_off(ip); lockdep_softirqs_off(ip);
raw_local_irq_restore(flags); raw_local_irq_restore(flags);
if (preempt_count() == cnt) { 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()); trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip());
if (softirq_count() == (cnt & SOFTIRQ_MASK)) if (softirq_count() == (cnt & SOFTIRQ_MASK))
trace_softirqs_on(_RET_IP_); lockdep_softirqs_on(_RET_IP_);
__preempt_count_sub(cnt); __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: * Are softirqs going to be turned on now:
*/ */
if (softirq_count() == SOFTIRQ_DISABLE_OFFSET) if (softirq_count() == SOFTIRQ_DISABLE_OFFSET)
trace_softirqs_on(ip); lockdep_softirqs_on(ip);
/* /*
* Keep preemption disabled until we are done with * Keep preemption disabled until we are done with
* softirq processing: * softirq processing: