This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/ppc64/kernel/process.c b/arch/ppc64/kernel/process.c
index e647e7b..8211337 100644 (file)
--- a/arch/ppc64/kernel/process.c
+++ b/arch/ppc64/kernel/process.c
@@ -315,6 +315,8 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
        extern void ret_from_fork(void);
        unsigned long sp = (unsigned long)p->thread_info + THREAD_SIZE;
 
+       p->set_child_tid = p->clear_child_tid = NULL;
+
        /* Copy registers */
        sp -= sizeof(struct pt_regs);
        childregs = (struct pt_regs *) sp;
@@ -510,11 +512,8 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,
        error = do_execve(filename, (char __user * __user *) a1,
                                    (char __user * __user *) a2, regs);
   
-       if (error == 0) {
-               task_lock(current);
+       if (error == 0)
                current->ptrace &= ~PT_DTRACE;
-               task_unlock(current);
-       }
        putname(filename);
 
 out: