|
@@ -2114,12 +2114,12 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb,
|
|
|
|
|
|
/**
|
|
/**
|
|
* futex_wait_requeue_pi() - Wait on uaddr and take uaddr2
|
|
* futex_wait_requeue_pi() - Wait on uaddr and take uaddr2
|
|
- * @uaddr: the futex we initialyl wait on (non-pi)
|
|
|
|
|
|
+ * @uaddr: the futex we initially wait on (non-pi)
|
|
* @fshared: whether the futexes are shared (1) or not (0). They must be
|
|
* @fshared: whether the futexes are shared (1) or not (0). They must be
|
|
* the same type, no requeueing from private to shared, etc.
|
|
* the same type, no requeueing from private to shared, etc.
|
|
* @val: the expected value of uaddr
|
|
* @val: the expected value of uaddr
|
|
* @abs_time: absolute timeout
|
|
* @abs_time: absolute timeout
|
|
- * @bitset: 32 bit wakeup bitset set by userspace, defaults to all.
|
|
|
|
|
|
+ * @bitset: 32 bit wakeup bitset set by userspace, defaults to all
|
|
* @clockrt: whether to use CLOCK_REALTIME (1) or CLOCK_MONOTONIC (0)
|
|
* @clockrt: whether to use CLOCK_REALTIME (1) or CLOCK_MONOTONIC (0)
|
|
* @uaddr2: the pi futex we will take prior to returning to user-space
|
|
* @uaddr2: the pi futex we will take prior to returning to user-space
|
|
*
|
|
*
|
|
@@ -2246,7 +2246,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared,
|
|
res = fixup_owner(uaddr2, fshared, &q, !ret);
|
|
res = fixup_owner(uaddr2, fshared, &q, !ret);
|
|
/*
|
|
/*
|
|
* If fixup_owner() returned an error, proprogate that. If it
|
|
* If fixup_owner() returned an error, proprogate that. If it
|
|
- * acquired the lock, clear our -ETIMEDOUT or -EINTR.
|
|
|
|
|
|
+ * acquired the lock, clear -ETIMEDOUT or -EINTR.
|
|
*/
|
|
*/
|
|
if (res)
|
|
if (res)
|
|
ret = (res < 0) ? res : 0;
|
|
ret = (res < 0) ? res : 0;
|