diff options
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index b911adceb2c4..4949d336d88d 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -916,8 +916,8 @@ retry: | |||
916 | hb1 = hash_futex(&key1); | 916 | hb1 = hash_futex(&key1); |
917 | hb2 = hash_futex(&key2); | 917 | hb2 = hash_futex(&key2); |
918 | 918 | ||
919 | double_lock_hb(hb1, hb2); | ||
920 | retry_private: | 919 | retry_private: |
920 | double_lock_hb(hb1, hb2); | ||
921 | op_ret = futex_atomic_op_inuser(op, uaddr2); | 921 | op_ret = futex_atomic_op_inuser(op, uaddr2); |
922 | if (unlikely(op_ret < 0)) { | 922 | if (unlikely(op_ret < 0)) { |
923 | 923 | ||
@@ -2117,7 +2117,6 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb, | |||
2117 | * Unqueue the futex_q and determine which it was. | 2117 | * Unqueue the futex_q and determine which it was. |
2118 | */ | 2118 | */ |
2119 | plist_del(&q->list, &q->list.plist); | 2119 | plist_del(&q->list, &q->list.plist); |
2120 | drop_futex_key_refs(&q->key); | ||
2121 | 2120 | ||
2122 | if (timeout && !timeout->task) | 2121 | if (timeout && !timeout->task) |
2123 | ret = -ETIMEDOUT; | 2122 | ret = -ETIMEDOUT; |