From 644a24b341c1e5d430f427e437c30b36f8daa5b9 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 25 May 2003 06:30:35 -0700 Subject: [FUTEX]: Fix kernel/compat.c after requeueing futex changes. --- kernel/compat.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'kernel') diff --git a/kernel/compat.c b/kernel/compat.c index e0998f98b72b..0dcf84ac1a7d 100644 --- 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 -- cgit v1.2.3 From b7df15ec8a42f5baea72e54bfa9d7677c2898d56 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 25 May 2003 06:31:21 -0700 Subject: [FUTEX]: Fix kernel/futex.c warning on 64-bit. --- kernel/futex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/futex.c b/kernel/futex.c index df2dcbf557d0..dc810cecb3c5 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -537,7 +537,7 @@ asmlinkage long sys_futex(u32 __user *uaddr, int op, int val, * requeue parameter in 'utime' if op == FUTEX_REQUEUE. */ if (op == FUTEX_REQUEUE) - val2 = (int) utime; + val2 = (int) (long) utime; return do_futex((unsigned long)uaddr, op, val, timeout, (unsigned long)uaddr2, val2); -- cgit v1.2.3