diff options
Diffstat (limited to 'kernel/futex_compat.c')
-rw-r--r-- | kernel/futex_compat.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index c153559ef289..9c077cf9aa84 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c | |||
@@ -121,9 +121,9 @@ err_unlock: | |||
121 | return ret; | 121 | return ret; |
122 | } | 122 | } |
123 | 123 | ||
124 | asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, int val, | 124 | asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val, |
125 | struct compat_timespec __user *utime, u32 __user *uaddr2, | 125 | struct compat_timespec __user *utime, u32 __user *uaddr2, |
126 | int val3) | 126 | u32 val3) |
127 | { | 127 | { |
128 | struct timespec t; | 128 | struct timespec t; |
129 | unsigned long timeout = MAX_SCHEDULE_TIMEOUT; | 129 | unsigned long timeout = MAX_SCHEDULE_TIMEOUT; |
@@ -137,6 +137,5 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, int val, | |||
137 | if (op >= FUTEX_REQUEUE) | 137 | if (op >= FUTEX_REQUEUE) |
138 | val2 = (int) (unsigned long) utime; | 138 | val2 = (int) (unsigned long) utime; |
139 | 139 | ||
140 | return do_futex((unsigned long)uaddr, op, val, timeout, | 140 | return do_futex(uaddr, op, val, timeout, uaddr2, val2, val3); |
141 | (unsigned long)uaddr2, val2, val3); | ||
142 | } | 141 | } |