summaryrefslogtreecommitdiff
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.ninka.net>2003-05-25 06:31:21 -0700
committerDavid S. Miller <davem@nuts.ninka.net>2003-05-25 06:31:21 -0700
commitb7df15ec8a42f5baea72e54bfa9d7677c2898d56 (patch)
tree0b6a03a480d210fcafb74afa3d1e9071e85650ac /kernel/futex.c
parent644a24b341c1e5d430f427e437c30b36f8daa5b9 (diff)
[FUTEX]: Fix kernel/futex.c warning on 64-bit.
Diffstat (limited to 'kernel/futex.c')
-rw-r--r--kernel/futex.c2
1 files changed, 1 insertions, 1 deletions
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);