X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=kernel%2Ffutex.c;h=4949d336d88d21edf82e51fceaa6b3960fad8790;hb=f579bbcd9bb8b688df03191b92c56ab8af4d6322;hp=b911adceb2c488523d0c2809049878dfde1eed27;hpb=e80fb7e52fd305b916a671755ca31ecf8f92e94e;p=mv-sheeva.git

diff --git a/kernel/futex.c b/kernel/futex.c
index b911adceb2c..4949d336d88 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -916,8 +916,8 @@ retry:
 	hb1 = hash_futex(&key1);
 	hb2 = hash_futex(&key2);
 
-	double_lock_hb(hb1, hb2);
 retry_private:
+	double_lock_hb(hb1, hb2);
 	op_ret = futex_atomic_op_inuser(op, uaddr2);
 	if (unlikely(op_ret < 0)) {
 
@@ -2117,7 +2117,6 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,
 		 * Unqueue the futex_q and determine which it was.
 		 */
 		plist_del(&q->list, &q->list.plist);
-		drop_futex_key_refs(&q->key);
 
 		if (timeout && !timeout->task)
 			ret = -ETIMEDOUT;