aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/futex.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/futex.c')
-rw-r--r--kernel/futex.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 6d2daa46f9ff..aec8bf89bf4e 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2555,9 +2555,6 @@ long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,
2555 ret = futex_wait_requeue_pi(uaddr, fshared, val, timeout, val3, 2555 ret = futex_wait_requeue_pi(uaddr, fshared, val, timeout, val3,
2556 clockrt, uaddr2); 2556 clockrt, uaddr2);
2557 break; 2557 break;
2558 case FUTEX_REQUEUE_PI:
2559 ret = futex_requeue(uaddr, fshared, uaddr2, val, val2, NULL, 1);
2560 break;
2561 case FUTEX_CMP_REQUEUE_PI: 2558 case FUTEX_CMP_REQUEUE_PI:
2562 ret = futex_requeue(uaddr, fshared, uaddr2, val, val2, &val3, 2559 ret = futex_requeue(uaddr, fshared, uaddr2, val, val2, &val3,
2563 1); 2560 1);
@@ -2596,8 +2593,7 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
2596 * number of waiters to wake in 'utime' if cmd == FUTEX_WAKE_OP. 2593 * number of waiters to wake in 'utime' if cmd == FUTEX_WAKE_OP.
2597 */ 2594 */
2598 if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE || 2595 if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE ||
2599 cmd == FUTEX_REQUEUE_PI || cmd == FUTEX_CMP_REQUEUE_PI || 2596 cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP)
2600 cmd == FUTEX_WAKE_OP)
2601 val2 = (u32) (unsigned long) utime; 2597 val2 = (u32) (unsigned long) utime;
2602 2598
2603 return do_futex(uaddr, op, val, tp, uaddr2, val2, val3); 2599 return do_futex(uaddr, op, val, tp, uaddr2, val2, val3);