From d4b5bbbfcf9557b96da4abfab626d7a6c5bd1c1c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 22 Oct 2012 22:52:26 -0400 Subject: [PATCH] --- yaml --- r: 340355 b: refs/heads/master c: 62e791c1b8ea481c72c299dee4f62c04aaef765c h: refs/heads/master i: 340353: 3930aa66ae98ca3def8a3a0841ab8885b6ccceab 340351: 775b1e150cbcd11df6d55a9ce515a04a22f4eba9 v: v3 --- [refs] | 2 +- trunk/kernel/fork.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1f134acc0f78..5ca36e7f0d9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afa86fc426ff7e7f5477f15da9c405d08d5cf790 +refs/heads/master: 62e791c1b8ea481c72c299dee4f62c04aaef765c diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index d96a562b1311..fa24a78b94f2 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -1127,7 +1127,6 @@ static void posix_cpu_timers_init(struct task_struct *tsk) */ static struct task_struct *copy_process(unsigned long clone_flags, unsigned long stack_start, - struct pt_regs *regs, unsigned long stack_size, int __user *child_tidptr, struct pid *pid, @@ -1536,8 +1535,7 @@ struct task_struct * __cpuinit fork_idle(int cpu) struct task_struct *task; struct pt_regs regs; - task = copy_process(CLONE_VM, 0, idle_regs(®s), 0, NULL, - &init_struct_pid, 0); + task = copy_process(CLONE_VM, 0, 0, NULL, &init_struct_pid, 0); if (!IS_ERR(task)) { init_idle_pids(task->pids); init_idle(task, cpu); @@ -1596,7 +1594,7 @@ long do_fork(unsigned long clone_flags, trace = 0; } - p = copy_process(clone_flags, stack_start, regs, stack_size, + p = copy_process(clone_flags, stack_start, stack_size, child_tidptr, NULL, trace); /* * Do this prior waking up the new thread - the thread pointer