mm: add /proc controls for pdflush threads

[safe/jmp/linux-2.6] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index 9c97f67..6b50a02 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -658,14 +658,9 @@ double_lock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2)
 static inline void
 double_unlock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2)
 {
-       if (hb1 <= hb2) {
+       spin_unlock(&hb1->lock);
+       if (hb1 != hb2)
                spin_unlock(&hb2->lock);
-               if (hb1 < hb2)
-                       spin_unlock(&hb1->lock);
-       } else { /* hb1 > hb2 */
-               spin_unlock(&hb1->lock);
-               spin_unlock(&hb2->lock);
-       }
 }
 
 /*