This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c
index f07d014..1dc9181 100644 (file)
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
@@ -45,7 +45,7 @@
 
 /* 
  * Power management idle function 
- * Set in pm platform drivers (apc.c and pmc.c)
+ * Set in pm platform drivers
  */
 void (*pm_idle)(void);
 
@@ -122,7 +122,7 @@ int cpu_idle(void)
                }
 
                while((!need_resched()) && pm_idle) {
-                       (*pm_idle)();
+                       (*pm_idle)();           /* XXX Huh? On sparc?! */
                }
 
                schedule();
@@ -480,6 +480,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
 #endif
        }
 
+       p->set_child_tid = p->clear_child_tid = NULL;
+
        /*
         *  p->thread_info         new_stack   childregs
         *  !                      !           !             {if(PSR_PS) }
@@ -668,11 +670,8 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
                          (char __user * __user *)regs->u_regs[base + UREG_I2],
                          regs);
        putname(filename);
-       if (error == 0) {
-               task_lock(current);
+       if (error == 0)
                current->ptrace &= ~PT_DTRACE;
-               task_unlock(current);
-       }
 out:
        return error;
 }