diff --git a/[refs] b/[refs] index e998889a5d49..681f50e8ef22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc2dd2e51a1940acac665696e6a70a1a73dc90a4 +refs/heads/master: 9abcf40b1d1443e6f0ef86e6a822193142a34abc diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index fc723e595cd5..d57118da73ff 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -1313,7 +1313,7 @@ noinline struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_re return regs; } -struct task_struct * __devinit fork_idle(int cpu) +struct task_struct * __cpuinit fork_idle(int cpu) { struct task_struct *task; struct pt_regs regs;