Commit e00b99de authored by Linus Torvalds's avatar Linus Torvalds

Fix futex compile breakage introduced by the compat code.

parent a428a69e
...@@ -427,7 +427,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm) ...@@ -427,7 +427,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
complete(vfork_done); complete(vfork_done);
} }
if (tsk->clear_child_tid && atomic_read(&mm->mm_users) > 1) { if (tsk->clear_child_tid && atomic_read(&mm->mm_users) > 1) {
int * tidptr = tsk->clear_child_tid; u32 * tidptr = tsk->clear_child_tid;
tsk->clear_child_tid = NULL; tsk->clear_child_tid = NULL;
/* /*
...@@ -435,7 +435,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm) ...@@ -435,7 +435,7 @@ void mm_release(struct task_struct *tsk, struct mm_struct *mm)
* not set up a proper pointer then tough luck. * not set up a proper pointer then tough luck.
*/ */
put_user(0, tidptr); put_user(0, tidptr);
sys_futex((unsigned long)tidptr, FUTEX_WAKE, 1, NULL); sys_futex(tidptr, FUTEX_WAKE, 1, NULL);
} }
} }
......
...@@ -420,7 +420,7 @@ static int futex_fd(unsigned long uaddr, int offset, int signal) ...@@ -420,7 +420,7 @@ static int futex_fd(unsigned long uaddr, int offset, int signal)
return ret; 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; unsigned long pos_in_page;
int ret; int ret;
...@@ -453,11 +453,10 @@ asmlinkage long sys_futex(u32 *uaddr, int op, int val, struct timespec *utime) ...@@ -453,11 +453,10 @@ asmlinkage long sys_futex(u32 *uaddr, int op, int val, struct timespec *utime)
struct timespec t; struct timespec t;
unsigned long timeout = MAX_SCHEDULE_TIMEOUT; unsigned long timeout = MAX_SCHEDULE_TIMEOUT;
if ((op == FUTEX_WAIT) && utime) { if ((op == FUTEX_WAIT) && utime) {
if (copy_from_user(&t, utime, sizeof(t)) != 0) if (copy_from_user(&t, utime, sizeof(t)) != 0)
return -EFAULT; return -EFAULT;
timeout = timespec_to_jiffies(t) + 1; timeout = timespec_to_jiffies(&t) + 1;
} }
return do_futex((unsigned long)uaddr, op, val, timeout); return do_futex((unsigned long)uaddr, op, val, timeout);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment