diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-16 21:25:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-02-16 21:25:03 -0800 |
| commit | bb89c58c186082eb7918c67e6ef3b98ffdff24dc (patch) | |
| tree | a678df98cea946893713f967bd8d1b28c97609e3 /kernel/compat.c | |
| parent | 5d4bd9bbb6302254c95305443b70649366ef957e (diff) | |
| parent | c90176df2c76e59abadb187368f15f3cde133dbc (diff) | |
Merge http://linux-sound.bkbits.net/linux-sound
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel/compat.c')
| -rw-r--r-- | kernel/compat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/compat.c b/kernel/compat.c index 892b49f14f5f..7b04cf90c847 100644 --- a/kernel/compat.c +++ b/kernel/compat.c @@ -17,6 +17,7 @@ #include <linux/time.h> #include <linux/signal.h> #include <linux/sched.h> /* for MAX_SCHEDULE_TIMEOUT */ +#include <linux/futex.h> /* for FUTEX_WAIT */ #include <asm/uaccess.h> @@ -210,7 +211,7 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t *set, return ret; } -extern long do_futex(u32 *, int, int, unsigned long); +extern long do_futex(unsigned long, int, int, unsigned long); asmlinkage long compat_sys_futex(u32 *uaddr, int op, int val, struct compat_timespec *utime) @@ -221,7 +222,7 @@ asmlinkage long compat_sys_futex(u32 *uaddr, int op, int val, if ((op == FUTEX_WAIT) && utime) { if (get_compat_timespec(&t, utime)) return -EFAULT; - timeout = timespec_to_jiffies(t) + 1; + timeout = timespec_to_jiffies(&t) + 1; } return do_futex((unsigned long)uaddr, op, val, timeout); } |