This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / m32r / kernel / process.c

diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c
index 4723ce6..9e7de27 100644 (file)
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
@@ -247,6 +247,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long spu,
        unsigned long sp = (unsigned long)tsk->thread_info + THREAD_SIZE;
        extern void ret_from_fork(void);
 
+       tsk->set_child_tid = tsk->clear_child_tid = NULL;
+
        /* Copy registers */
        sp -= sizeof (struct pt_regs);
        childregs = (struct pt_regs *)sp;
@@ -333,11 +335,8 @@ asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv, c
                goto out;
 
        error = do_execve(filename, uargv, uenvp, &regs);
-       if (error == 0) {
-               task_lock(current);
+       if (error == 0)
                current->ptrace &= ~PT_DTRACE;
-               task_unlock(current);
-       }
        putname(filename);
 out:
        return error;