aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAlexander Viro <viro@parcelfarce.linux.theplanet.co.uk>2004-07-13 19:37:49 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-13 19:37:49 -0700
commit0056bf1e5bc48e11a3f0098e25ef3ac38cd7d7c3 (patch)
tree0a0763d65b4852a3bf342d5abd662708e37f3503 /kernel
parent64ed7893dcf7086505c124dc19be0eb284f76282 (diff)
downloadhistory-0056bf1e5bc48e11a3f0098e25ef3ac38cd7d7c3.tar.gz
[PATCH] pointer-to-int done the canonical way
Extraction of int from pointer is slightly broken in several places.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/futex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index d9b9694fd2e859..9a25d76bd6bd9a 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -704,7 +704,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) (long) utime;
+ val2 = (int) (unsigned long) utime;
return do_futex((unsigned long)uaddr, op, val, timeout,
(unsigned long)uaddr2, val2, val3);