This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/sh64/kernel/process.c b/arch/sh64/kernel/process.c
index 9f46fbc..13cec35 100644 (file)
--- a/arch/sh64/kernel/process.c
+++ b/arch/sh64/kernel/process.c
@@ -765,6 +765,9 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
        childregs->regs[9] = 0; /* Set return value for child */
        childregs->sr |= SR_FD; /* Invalidate FPU flag */
 
+       /* From sh */
+       p->set_child_tid = p->clear_child_tid = NULL;
+
        p->thread.sp = (unsigned long) childregs;
        p->thread.pc = (unsigned long) ret_from_fork;
 
@@ -859,11 +862,8 @@ asmlinkage int sys_execve(char *ufilename, char **uargv,
                          (char __user * __user *)uargv,
                          (char __user * __user *)uenvp,
                          pregs);
-       if (error == 0) {
-               task_lock(current);
+       if (error == 0)
                current->ptrace &= ~PT_DTRACE;
-               task_unlock(current);
-       }
        putname(filename);
 out:
        unlock_kernel();