diff --git a/[refs] b/[refs] index 8eac6edbaf9e..9c031f8cfa3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1b26c32af51d0fd82754bc06b495dd03c2f2d58 +refs/heads/master: 753ca4f312a4b26940e4731b4fa5dbbbbcc77e97 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 3da978eec791..8cdd3e72ba55 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -1315,9 +1315,8 @@ struct task_struct * __devinit fork_idle(int cpu) struct pt_regs regs; task = copy_process(CLONE_VM, 0, idle_regs(®s), 0, NULL, NULL, 0); - if (!task) - return ERR_PTR(-ENOMEM); - init_idle(task, cpu); + if (!IS_ERR(task)) + init_idle(task, cpu); return task; }