[PATCH] kill unushed __put_task_struct_cb

Somehow in the midst of dotting i's and crossing t's during
the merge up to rc1 we wound up keeping __put_task_struct_cb
when it should have been killed as it no longer has any users.
Sorry I probably should have caught this while it was
still in the -mm tree.

Having the old code there gets confusing when reading
through the code and trying to understand what is
happening.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/linux/sched.h b/include/linux/sched.h
index e3539c14e47e9657a6418b0f0f01526d8c2b27ab..b7d31e2e1729027ada80a4759eb2eb7618d482ae 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -911,7 +911,6 @@ static inline int pid_alive(struct task_struct *p)
 extern void free_task(struct task_struct *tsk);
 #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
 
-extern void __put_task_struct_cb(struct rcu_head *rhp);
 extern void __put_task_struct(struct task_struct *t);
 
 static inline void put_task_struct(struct task_struct *t)

diff --git a/kernel/fork.c b/kernel/fork.c
index 3384eb89cb1c4ff25c5448ff91502bd4a79ee7db..54b15f8cda538b3a721c03704c04390a369ae65c 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -124,12 +124,6 @@ void __put_task_struct(struct task_struct *tsk)
                free_task(tsk);
 }
 
-void __put_task_struct_cb(struct rcu_head *rhp)
-{
-       struct task_struct *tsk = container_of(rhp, struct task_struct, rcu);
-       __put_task_struct(tsk);
-}
-
 void __init fork_init(unsigned long mempages)
 {
 #ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR