summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2006-04-14 12:43:15 -0600
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-14 17:43:57 -0700
commit64541d19702cfdb7ea946fdc20faee849f6874b1 (patch)
tree0eb2fbcac51359b590b9692b112fe662fee49a4a
parent1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2 (diff)
downloadop-kernel-dev-64541d19702cfdb7ea946fdc20faee849f6874b1.zip
op-kernel-dev-64541d19702cfdb7ea946fdc20faee849f6874b1.tar.gz
[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 e3539c1..b7d31e2 100644
--- 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 3384eb8..54b15f8 100644
--- 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
OpenPOWER on IntegriCloud