[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

diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 869d2533ae0b77d99e1344215c44e99845808630..11356352f4058bb3a6ce6f33f3c4d2fa266b1f81 100644 (file)
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -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()?
         */
        if (clone_flags & CLONE_CLEARTID)
-               p->user_tid = (long *) childregs->edx;
+               p->user_tid = (int *) childregs->edx;
        return 0;
 }
 

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 5afeecb164b946adeeba957540647d02ed25a97b..8335c0df1d41b212bba4d6a36e48f945af76ea21 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -309,7 +309,7 @@ struct task_struct {
 
        wait_queue_head_t wait_chldexit;        /* for wait4() */
        struct completion *vfork_done;          /* for vfork() */
-       long *user_tid;                         /* for CLONE_CLEARTID */
+       int *user_tid;                          /* for CLONE_CLEARTID */
 
        unsigned long rt_priority;
        unsigned long it_real_value, it_prof_value, it_virt_value;

diff --git a/kernel/fork.c b/kernel/fork.c
index f13f6ae9e457cff405018ea2ce80e29346ffc14c..491079bcf5cc4730bcd4f84989ed00290b57f928 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -377,7 +377,7 @@ void mm_release(void)
                 * We dont check the error code - if userspace has
                 * 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);
        }
 }