diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2006-04-14 14:43:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-14 20:43:57 -0400 |
| commit | 64541d19702cfdb7ea946fdc20faee849f6874b1 (patch) | |
| tree | 0eb2fbcac51359b590b9692b112fe662fee49a4a | |
| parent | 1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2 (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.h | 1 | ||||
| -rw-r--r-- | kernel/fork.c | 6 |
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) | |||
| 911 | extern void free_task(struct task_struct *tsk); | 911 | extern 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 | ||
| 914 | extern void __put_task_struct_cb(struct rcu_head *rhp); | ||
| 915 | extern void __put_task_struct(struct task_struct *t); | 914 | extern void __put_task_struct(struct task_struct *t); |
| 916 | 915 | ||
| 917 | static inline void put_task_struct(struct task_struct *t) | 916 | static 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 | ||
| 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 |
