Merge branch 'core/locking' into tracing/ftrace

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/idr.c b/lib/idr.c
index c11c5765cdef..dab4bca86f5d 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -449,6 +449,7 @@ void idr_remove_all(struct idr *idp)
 
         n = idp->layers * IDR_BITS;
         p = idp->top;
+        rcu_assign_pointer(idp->top, NULL);
         max = 1 << n;
 
         id = 0;
@@ -467,7 +468,6 @@ void idr_remove_all(struct idr *idp)
                         p = *--paa;
                 }
         }
-        rcu_assign_pointer(idp->top, NULL);
         idp->layers = 0;
 }
 EXPORT_SYMBOL(idr_remove_all);
diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
index 280332c1827c..619313ed6c46 100644
--- 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();