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

[pandora-kernel.git] / kernel / mutex.c

diff --git a/kernel/mutex.c b/kernel/mutex.c
index fe4706c..2c938e2 100644 (file)
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -162,13 +162,6 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
        for (;;) {
                struct task_struct *owner;
 
-               /*
-                * If we own the BKL, then don't spin. The owner of
-                * the mutex might be waiting on us to release the BKL.
-                */
-               if (unlikely(current->lock_depth >= 0))
-                       break;
-
                /*
                 * If there's an owner, wait for it to either
                 * release the lock or go to sleep.