lockdep: Rename trace_{hard,soft}{irq_context,irqs_enabled}()

Continue what commit:

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

started, rename these to avoid confusing them with tracepoints.

git grep -l "trace_\(soft\|hard\)\(irq_context\|irqs_enabled\)" | while read file;
do
	sed -ie 's/trace_\(soft\|hard\)\(irq_context\|irqs_enabled\)/lockdep_\1\2/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.178626842@infradead.org

diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 7ca1f2126ae158c97a411a78cdfb77b4cfbc3a5f..f4c3907e241a677cf26b29cc5f673c91f023a6fa 100644 (file)
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -31,10 +31,10 @@
 #ifdef CONFIG_TRACE_IRQFLAGS
   extern void trace_hardirqs_on(void);
   extern void trace_hardirqs_off(void);
-# define trace_hardirq_context(p)      ((p)->hardirq_context)
-# define trace_softirq_context(p)      ((p)->softirq_context)
-# define trace_hardirqs_enabled(p)     ((p)->hardirqs_enabled)
-# define trace_softirqs_enabled(p)     ((p)->softirqs_enabled)
+# define lockdep_hardirq_context(p)    ((p)->hardirq_context)
+# define lockdep_softirq_context(p)    ((p)->softirq_context)
+# define lockdep_hardirqs_enabled(p)   ((p)->hardirqs_enabled)
+# define lockdep_softirqs_enabled(p)   ((p)->softirqs_enabled)
 # define lockdep_hardirq_enter()               \
 do {                                           \
        current->hardirq_context++;             \
@@ -54,10 +54,10 @@ do {                                                \
 #else
 # define trace_hardirqs_on()           do { } while (0)
 # define trace_hardirqs_off()          do { } while (0)
-# define trace_hardirq_context(p)      0
-# define trace_softirq_context(p)      0
-# define trace_hardirqs_enabled(p)     0
-# define trace_softirqs_enabled(p)     0
+# define lockdep_hardirq_context(p)    0
+# define lockdep_softirq_context(p)    0
+# define lockdep_hardirqs_enabled(p)   0
+# define lockdep_softirqs_enabled(p)   0
 # define lockdep_hardirq_enter()       do { } while (0)
 # define lockdep_hardirq_exit()                do { } while (0)
 # define lockdep_softirq_enter()       do { } while (0)

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 26ef41296fb33b74c08ae527400e00ab3b38260b..4075e3ec460bfc4d12246a50b8eca5bf304c26b3 100644 (file)
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -3081,10 +3081,10 @@ print_usage_bug(struct task_struct *curr, struct held_lock *this,
 
        pr_warn("%s/%d [HC%u[%lu]:SC%u[%lu]:HE%u:SE%u] takes:\n",
                curr->comm, task_pid_nr(curr),
-               trace_hardirq_context(curr), hardirq_count() >> HARDIRQ_SHIFT,
-               trace_softirq_context(curr), softirq_count() >> SOFTIRQ_SHIFT,
-               trace_hardirqs_enabled(curr),
-               trace_softirqs_enabled(curr));
+               lockdep_hardirq_context(curr), hardirq_count() >> HARDIRQ_SHIFT,
+               lockdep_softirq_context(curr), softirq_count() >> SOFTIRQ_SHIFT,
+               lockdep_hardirqs_enabled(curr),
+               lockdep_softirqs_enabled(curr));
        print_lock(this);
 
        pr_warn("{%s} state was registered at:\n", usage_str[prev_bit]);

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 0112ca01694b2de854fdd1ea5be2b3ad02a3dfc3..a47c6dd574520d737edb8faae3a8011d0422ec58 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -224,7 +224,7 @@ static inline bool lockdep_softirq_start(void)
 {
        bool in_hardirq = false;
 
-       if (trace_hardirq_context(current)) {
+       if (lockdep_hardirq_context(current)) {
                in_hardirq = true;
                lockdep_hardirq_exit();
        }

diff --git a/tools/include/linux/irqflags.h b/tools/include/linux/irqflags.h
index ced6f64a7367a219144e5ad684fafe56227c9555..67e01bbadbfe86fa846a36e21ada979526698c57 100644 (file)
--- a/tools/include/linux/irqflags.h
+++ b/tools/include/linux/irqflags.h
@@ -2,10 +2,10 @@
 #ifndef _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_
 #define _LIBLOCKDEP_LINUX_TRACE_IRQFLAGS_H_
 
-# define trace_hardirq_context(p)      0
-# define trace_softirq_context(p)      0
-# define trace_hardirqs_enabled(p)     0
-# define trace_softirqs_enabled(p)     0
+# define lockdep_hardirq_context(p)    0
+# define lockdep_softirq_context(p)    0
+# define lockdep_hardirqs_enabled(p)   0
+# define lockdep_softirqs_enabled(p)   0
 # define lockdep_hardirq_enter()       do { } while (0)
 # define lockdep_hardirq_exit()                do { } while (0)
 # define lockdep_softirq_enter()       do { } while (0)