[FUTEX]: Fix kernel/compat.c after requeueing futex changes.

diff --git a/kernel/compat.c b/kernel/compat.c
index e0998f98b72b2a48eed6c63cef6eae42d3d0a397..0dcf84ac1a7de9b9405d8cc2111d695e76bd2c10 100644 (file)
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -214,7 +214,7 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t *set,
 
 #ifdef CONFIG_FUTEX
 asmlinkage long compat_sys_futex(u32 *uaddr, int op, int val,
-               struct compat_timespec *utime)
+               struct compat_timespec *utime, u32 *uaddr2)
 {
        struct timespec t;
        unsigned long timeout = MAX_SCHEDULE_TIMEOUT;
@@ -226,9 +226,10 @@ asmlinkage long compat_sys_futex(u32 *uaddr, int op, int val,
                timeout = timespec_to_jiffies(&t) + 1;
        }
        if (op == FUTEX_REQUEUE)
-               val2 = (int) utime;
+               val2 = (int) (long) utime;
 
-       return do_futex((unsigned long)uaddr, op, val, timeout, uaddr2, val2);
+       return do_futex((unsigned long)uaddr, op, val, timeout,
+                       (unsigned long)uaddr2, val2);
 }
 #endif