aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2006-04-14 14:43:15 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-14 20:43:57 -0400
commit64541d19702cfdb7ea946fdc20faee849f6874b1 (patch)
tree0eb2fbcac51359b590b9692b112fe662fee49a4a
parent1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2 (diff)
[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>
-rw-r--r--include/linux/sched.h1
-rw-r--r--kernel/fork.c6
2 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index e3539c14e47e..b7d31e2e1729 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -911,7 +911,6 @@ static inline int pid_alive(struct task_struct *p)
911extern void free_task(struct task_struct *tsk); 911extern void free_task(struct task_struct *tsk);
912#define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) 912#define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
913 913
914extern void __put_task_struct_cb(struct rcu_head *rhp);
915extern void __put_task_struct(struct task_struct *t); 914extern void __put_task_struct(struct task_struct *t);
916 915
917static inline void put_task_struct(struct task_struct *t) 916static inline void put_task_struct(struct task_struct *t)
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
127void __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
133void __init fork_init(unsigned long mempages) 127void __init fork_init(unsigned long mempages)
134{ 128{
135#ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR 129#ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR