This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 1e6d675..6e835be 100644 (file)
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -54,9 +54,6 @@ unsigned long kernel_thread_flags = CLONE_VM | CLONE_UNTRACED;
 
 atomic_t hlt_counter = ATOMIC_INIT(0);
 
-unsigned long boot_option_idle_override = 0;
-EXPORT_SYMBOL(boot_option_idle_override);
-
 /*
  * Powermanagement idle function, if any..
  */
@@ -199,7 +196,6 @@ static int __init idle_setup (char *str)
                pm_idle = poll_idle;
        }
 
-       boot_option_idle_override = 1;
        return 1;
 }
 
@@ -257,8 +253,6 @@ void show_regs(struct pt_regs *regs)
        show_trace(&regs->rsp);
 }
 
-EXPORT_SYMBOL_GPL(show_regs);
-
 /*
  * Free current thread data structures etc..
  */
@@ -365,6 +359,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long rsp,
        if (rsp == ~0UL) {
                childregs->rsp = (unsigned long)childregs;
        }
+       p->set_child_tid = p->clear_child_tid = NULL;
 
        p->thread.rsp = (unsigned long) childregs;
        p->thread.rsp0 = (unsigned long) (childregs+1);
@@ -547,11 +542,8 @@ long sys_execve(char __user *name, char __user * __user *argv,
        if (IS_ERR(filename)) 
                return error;
        error = do_execve(filename, argv, envp, &regs); 
-       if (error == 0) {
-               task_lock(current);
+       if (error == 0)
                current->ptrace &= ~PT_DTRACE;
-               task_unlock(current);
-       }
        putname(filename);
        return error;
 }