diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-02 08:31:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-02 08:31:55 -0500 |
| commit | ae2c27a78f1df5b0967069cd3b916cff1eb044c8 (patch) | |
| tree | e67f1012e76185bac2e78bb04caa68ed1f7dc2a2 /kernel/fork.c | |
| parent | a608ab9cb6a5050394498b2520c6e7c162f4e2cf (diff) | |
| parent | e34efe3b100d0fbdf053128956c3dd0bc68754d6 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index fc723e595cd5..d57118da73ff 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -1313,7 +1313,7 @@ noinline struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_re | |||
| 1313 | return regs; | 1313 | return regs; |
| 1314 | } | 1314 | } |
| 1315 | 1315 | ||
| 1316 | struct task_struct * __devinit fork_idle(int cpu) | 1316 | struct task_struct * __cpuinit fork_idle(int cpu) |
| 1317 | { | 1317 | { |
| 1318 | struct task_struct *task; | 1318 | struct task_struct *task; |
| 1319 | struct pt_regs regs; | 1319 | struct pt_regs regs; |