aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorBjoern B. Brandenburg <bbb@jupiter-cs.cs.unc.edu>2007-02-05 16:20:21 -0500
committerBjoern B. Brandenburg <bbb@jupiter-cs.cs.unc.edu>2007-02-05 16:20:21 -0500
commit89fb43c271050f097b93f94e03a015e8d441f359 (patch)
treecc0425aa2d9dff5496c54a4b83bcab24ece11f5a /kernel
parentee5b27bdf3566e59b3de6cc377e318abccbe859e (diff)
parent62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff)
Update base version to the final relesae of 2.6.20.
Merge with git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fork.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 57ee05252a..87dbaec676 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1318,7 +1318,7 @@ noinline struct pt_regs * __devinit __attribute__((weak)) idle_regs(struct pt_re
1318 return regs; 1318 return regs;
1319} 1319}
1320 1320
1321struct task_struct * __devinit fork_idle(int cpu) 1321struct task_struct * __cpuinit fork_idle(int cpu)
1322{ 1322{
1323 struct task_struct *task; 1323 struct task_struct *task;
1324 struct pt_regs regs; 1324 struct pt_regs regs;