From 6ace899b1bb2f46db0c6ec075bae585d19a73855 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Fri, 14 Apr 2006 12:43:15 -0600
Subject: [PATCH] --- yaml --- r: 25848 b: refs/heads/master c:
 64541d19702cfdb7ea946fdc20faee849f6874b1 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/sched.h | 1 -
 trunk/kernel/fork.c         | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 493d7d623267..43bc273f127a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f60245479ca6d4d3f2cf4a47c7dd18caf5afdf2
+refs/heads/master: 64541d19702cfdb7ea946fdc20faee849f6874b1
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index e3539c14e47e..b7d31e2e1729 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/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/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 3384eb89cb1c..54b15f8cda53 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/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