From 2966c76e0626451538d75bca59375261334f2709 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Tue, 28 Mar 2006 16:11:14 -0800
Subject: [PATCH] --- yaml --- r: 24558 b: refs/heads/master c:
 7001510d0cbf51ad202dd2d0744f54104285cbb9 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/sched.h |  1 -
 trunk/kernel/fork.c         |  3 ++-
 trunk/kernel/signal.c       | 14 --------------
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index f4518a09a83c..6755378f24f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9e88e84b5245da0a1dadb6ccca70ae84e93ccf6
+refs/heads/master: 7001510d0cbf51ad202dd2d0744f54104285cbb9
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index ca1fd31aae97..69c2a1e1529e 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1151,7 +1151,6 @@ extern void exit_thread(void);
 extern void exit_files(struct task_struct *);
 extern void exit_signal(struct task_struct *);
 extern void __exit_signal(struct task_struct *);
-extern void exit_sighand(struct task_struct *);
 extern void __exit_sighand(struct task_struct *);
 extern void exit_itimers(struct signal_struct *);
 
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 33ffb5bf0dbc..8a46ad52be8f 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1208,7 +1208,8 @@ static task_t *copy_process(unsigned long clone_flags,
 bad_fork_cleanup_signal:
 	exit_signal(p);
 bad_fork_cleanup_sighand:
-	exit_sighand(p);
+	if (p->sighand)
+		__exit_sighand(p);
 bad_fork_cleanup_fs:
 	exit_fs(p); /* blocking */
 bad_fork_cleanup_files:
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index c5b65aa4c2bc..1d7f4463c32d 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -336,20 +336,6 @@ void __exit_sighand(struct task_struct *tsk)
 		kmem_cache_free(sighand_cachep, sighand);
 }
 
-void exit_sighand(struct task_struct *tsk)
-{
-	write_lock_irq(&tasklist_lock);
-	rcu_read_lock();
-	if (tsk->sighand != NULL) {
-		struct sighand_struct *sighand = rcu_dereference(tsk->sighand);
-		spin_lock(&sighand->siglock);
-		__exit_sighand(tsk);
-		spin_unlock(&sighand->siglock);
-	}
-	rcu_read_unlock();
-	write_unlock_irq(&tasklist_lock);
-}
-
 /*
  * This function expects the tasklist_lock write-locked.
  */