Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340355
b: refs/heads/master
c: 62e791c
h: refs/heads/master
i:
  340353: 3930aa6
  340351: 775b1e1
v: v3
  • Loading branch information
Al Viro committed Nov 29, 2012
1 parent dce1521 commit d4b5bbb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: afa86fc426ff7e7f5477f15da9c405d08d5cf790
refs/heads/master: 62e791c1b8ea481c72c299dee4f62c04aaef765c
6 changes: 2 additions & 4 deletions trunk/kernel/fork.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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(&regs), 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);
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit d4b5bbb

Please sign in to comment.