Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 2 insertions, 2 deletions

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