Merge commit 'v2.6.30-rc5' into sched/core

[mirror_ubuntu-artful-kernel.git] / kernel / mutex.c

diff --git a/kernel/mutex.c b/kernel/mutex.c
index e1fb735104090c84a72e8d931a6b2c16e50f0b95..6ca5fe96e393a5176428e95b34d6aa9fcc20de2b 100644 (file)
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -148,7 +148,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 
        preempt_disable();
        mutex_acquire(&lock->dep_map, subclass, 0, ip);
-#if defined(CONFIG_SMP) && !defined(CONFIG_DEBUG_MUTEXES)
+#if defined(CONFIG_SMP) && !defined(CONFIG_DEBUG_MUTEXES) && \
+    !defined(CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES)
        /*
         * Optimistic spinning.
         *