Commit 9de5fc35 authored by David S. Miller's avatar David S. Miller

[CLONE_*TID]: Make tsk->user_tid and int so that 64-bit arches work.

- futex uses int as its atomic word type, we pass in user_tid
to the futex routines, so the types must match
parent 043fbe58
...@@ -625,7 +625,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long esp, ...@@ -625,7 +625,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long esp,
* Does the userspace VM want the TID cleared on mm_release()? * Does the userspace VM want the TID cleared on mm_release()?
*/ */
if (clone_flags & CLONE_CLEARTID) if (clone_flags & CLONE_CLEARTID)
p->user_tid = (long *) childregs->edx; p->user_tid = (int *) childregs->edx;
return 0; return 0;
} }
......
...@@ -309,7 +309,7 @@ struct task_struct { ...@@ -309,7 +309,7 @@ struct task_struct {
wait_queue_head_t wait_chldexit; /* for wait4() */ wait_queue_head_t wait_chldexit; /* for wait4() */
struct completion *vfork_done; /* for vfork() */ struct completion *vfork_done; /* for vfork() */
long *user_tid; /* for CLONE_CLEARTID */ int *user_tid; /* for CLONE_CLEARTID */
unsigned long rt_priority; unsigned long rt_priority;
unsigned long it_real_value, it_prof_value, it_virt_value; unsigned long it_real_value, it_prof_value, it_virt_value;
......
...@@ -377,7 +377,7 @@ void mm_release(void) ...@@ -377,7 +377,7 @@ void mm_release(void)
* We dont check the error code - if userspace has * We dont check the error code - if userspace has
* not set up a proper pointer then tough luck. * not set up a proper pointer then tough luck.
*/ */
put_user(0UL, tsk->user_tid); put_user(0, tsk->user_tid);
sys_futex(tsk->user_tid, FUTEX_WAKE, 1, NULL); sys_futex(tsk->user_tid, FUTEX_WAKE, 1, NULL);
} }
} }
......
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