diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 04:54:00 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 04:54:00 -0400 |
commit | 4741c336d27dec3ea68a35659abb8dc82b142388 (patch) | |
tree | a8576df82129354b77b0144c480c446ec7aba7b2 /kernel/fork.c | |
parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
parent | a9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff) |
Merge branch 'master'
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 |