Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / lib / locking-selftest.c

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();