diff options
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 248dd119a86e..6c498b145a4f 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -2114,12 +2114,12 @@ int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb, | |||
2114 | 2114 | ||
2115 | /** | 2115 | /** |
2116 | * futex_wait_requeue_pi() - Wait on uaddr and take uaddr2 | 2116 | * futex_wait_requeue_pi() - Wait on uaddr and take uaddr2 |
2117 | * @uaddr: the futex we initialyl wait on (non-pi) | 2117 | * @uaddr: the futex we initially wait on (non-pi) |
2118 | * @fshared: whether the futexes are shared (1) or not (0). They must be | 2118 | * @fshared: whether the futexes are shared (1) or not (0). They must be |
2119 | * the same type, no requeueing from private to shared, etc. | 2119 | * the same type, no requeueing from private to shared, etc. |
2120 | * @val: the expected value of uaddr | 2120 | * @val: the expected value of uaddr |
2121 | * @abs_time: absolute timeout | 2121 | * @abs_time: absolute timeout |
2122 | * @bitset: 32 bit wakeup bitset set by userspace, defaults to all. | 2122 | * @bitset: 32 bit wakeup bitset set by userspace, defaults to all |
2123 | * @clockrt: whether to use CLOCK_REALTIME (1) or CLOCK_MONOTONIC (0) | 2123 | * @clockrt: whether to use CLOCK_REALTIME (1) or CLOCK_MONOTONIC (0) |
2124 | * @uaddr2: the pi futex we will take prior to returning to user-space | 2124 | * @uaddr2: the pi futex we will take prior to returning to user-space |
2125 | * | 2125 | * |
@@ -2246,7 +2246,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared, | |||
2246 | res = fixup_owner(uaddr2, fshared, &q, !ret); | 2246 | res = fixup_owner(uaddr2, fshared, &q, !ret); |
2247 | /* | 2247 | /* |
2248 | * If fixup_owner() returned an error, proprogate that. If it | 2248 | * If fixup_owner() returned an error, proprogate that. If it |
2249 | * acquired the lock, clear our -ETIMEDOUT or -EINTR. | 2249 | * acquired the lock, clear -ETIMEDOUT or -EINTR. |
2250 | */ | 2250 | */ |
2251 | if (res) | 2251 | if (res) |
2252 | ret = (res < 0) ? res : 0; | 2252 | ret = (res < 0) ? res : 0; |