Merge branch 'linus' into x86/mm

x86/mm is on 32-rc4 and missing the spinlock namespace changes which
are needed for further commits into this topic.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/rtmutex-debug.c b/kernel/rtmutex-debug.c
index 5fcb4fe645e2..ddabb54bb5c8 100644
--- a/kernel/rtmutex-debug.c
+++ b/kernel/rtmutex-debug.c
@@ -37,8 +37,8 @@ do {								\
         if (rt_trace_on) {                                      \
                 rt_trace_on = 0;                                \
                 console_verbose();                              \
-                if (spin_is_locked(&current->pi_lock))          \
-                        spin_unlock(&current->pi_lock);         \
+                if (raw_spin_is_locked(&current->pi_lock))      \
+                        raw_spin_unlock(&current->pi_lock);     \
         }                                                       \
 } while (0)