diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:10 -0400 |
| commit | b2b4b9a7c09ad66e095b13c97946a96f2dc8284e (patch) | |
| tree | fb856b5998df266bd83e6e64b8884287e812845a /kernel/fork.c | |
| parent | 875999c5539999f61a45620aae0c3e5fb1d2b035 (diff) | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 3384eb89cb1c..54b15f8cda53 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -124,12 +124,6 @@ void __put_task_struct(struct task_struct *tsk) | |||
| 124 | free_task(tsk); | 124 | free_task(tsk); |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | void __put_task_struct_cb(struct rcu_head *rhp) | ||
| 128 | { | ||
| 129 | struct task_struct *tsk = container_of(rhp, struct task_struct, rcu); | ||
| 130 | __put_task_struct(tsk); | ||
| 131 | } | ||
| 132 | |||
| 133 | void __init fork_init(unsigned long mempages) | 127 | void __init fork_init(unsigned long mempages) |
| 134 | { | 128 | { |
| 135 | #ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR | 129 | #ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR |
