summaryrefslogtreecommitdiff
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2003-02-14 20:49:07 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2003-02-14 20:49:07 -0800
commite00b99de4aff5eee11591eba7399ecad11f48a50 (patch)
treebc49ea794c55d3f6afb1e9523cc0fa58532918da /kernel/futex.c
parenta428a69e4958da031015f7e8517807b44d318083 (diff)
Fix futex compile breakage introduced by the compat code.
Diffstat (limited to 'kernel/futex.c')
-rw-r--r--kernel/futex.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 9813932a6a0a..4cade10892db 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -420,7 +420,7 @@ out:
return ret;
}
-long do_futex(unsigned long uaddr, int op, int val, unsinged long timeout)
+long do_futex(unsigned long uaddr, int op, int val, unsigned long timeout)
{
unsigned long pos_in_page;
int ret;
@@ -453,11 +453,10 @@ asmlinkage long sys_futex(u32 *uaddr, int op, int val, struct timespec *utime)
struct timespec t;
unsigned long timeout = MAX_SCHEDULE_TIMEOUT;
-
if ((op == FUTEX_WAIT) && utime) {
if (copy_from_user(&t, utime, sizeof(t)) != 0)
return -EFAULT;
- timeout = timespec_to_jiffies(t) + 1;
+ timeout = timespec_to_jiffies(&t) + 1;
}
return do_futex((unsigned long)uaddr, op, val, timeout);
}