locking: rename trace_softirq_[enter|exit] => lockdep_softirq_[enter|exit]

Impact: cleanup

The naming clashes with upcoming softirq tracepoints, so rename the
APIs to lockdep_*().

Requested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 74bde13224c926f5204a2c514609def00d465325..b02a3f1d46a0595788b86220bcbee174171ad78c 100644 (file)
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -24,8 +24,8 @@
 # define trace_softirqs_enabled(p)     ((p)->softirqs_enabled)
 # define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
 # define trace_hardirq_exit()  do { current->hardirq_context--; } while (0)
-# define trace_softirq_enter() do { current->softirq_context++; } while (0)
-# define trace_softirq_exit()  do { current->softirq_context--; } while (0)
+# define lockdep_softirq_enter()       do { current->softirq_context++; } while (0)
+# define lockdep_softirq_exit()        do { current->softirq_context--; } while (0)
 # define INIT_TRACE_IRQFLAGS   .softirqs_enabled = 1,
 #else
 # define trace_hardirqs_on()           do { } while (0)
@@ -38,8 +38,8 @@
 # define trace_softirqs_enabled(p)     0
 # define trace_hardirq_enter()         do { } while (0)
 # define trace_hardirq_exit()          do { } while (0)
-# define trace_softirq_enter()         do { } while (0)
-# define trace_softirq_exit()          do { } while (0)
+# define lockdep_softirq_enter()       do { } while (0)
+# define lockdep_softirq_exit()                do { } while (0)
 # define INIT_TRACE_IRQFLAGS
 #endif
 

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 9041ea7948feffbf887ed92fb8ce1e73ad55c81c..08a030f85416c3e73d6131f5605d997403fa509c 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -180,7 +180,7 @@ asmlinkage void __do_softirq(void)
        account_system_vtime(current);
 
        __local_bh_disable((unsigned long)__builtin_return_address(0));
-       trace_softirq_enter();
+       lockdep_softirq_enter();
 
        cpu = smp_processor_id();
 restart:
@@ -220,7 +220,7 @@ restart:
        if (pending)
                wakeup_softirqd();
 
-       trace_softirq_exit();
+       lockdep_softirq_exit();
 
        account_system_vtime(current);
        _local_bh_enable();

diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 280332c1827cbb7b1d183e349f8eb1ba35cd2f8e..619313ed6c46d78ef7b35a6ab870bfd764376486 100644 (file)
--- a/lib/locking-selftest.c
+++ b/lib/locking-selftest.c
@@ -157,11 +157,11 @@ static void init_shared_classes(void)
 #define SOFTIRQ_ENTER()                                \
                local_bh_disable();             \
                local_irq_disable();            \
-               trace_softirq_enter();          \
+               lockdep_softirq_enter();        \
                WARN_ON(!in_softirq());
 
 #define SOFTIRQ_EXIT()                         \
-               trace_softirq_exit();           \
+               lockdep_softirq_exit();         \
                local_irq_enable();             \
                local_bh_enable();