3 files changed, 5 insertions, 8 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 99855f694ebd..d04186d8cc68 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1151,7 +1151,7 @@ extern void exit_thread(void);
 
 extern void exit_files(struct task_struct *);
 extern void __cleanup_signal(struct signal_struct *);
-extern void cleanup_sighand(struct task_struct *);
+extern void __cleanup_sighand(struct sighand_struct *);
 extern void exit_itimers(struct signal_struct *);
 
 extern NORET_TYPE void do_group_exit(int);
diff --git a/kernel/exit.c b/kernel/exit.c
index 22399caf7574..bc0ec674d3f4 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -114,10 +114,11 @@ static void __exit_signal(struct task_struct *tsk)
         __unhash_process(tsk);
 
         tsk->signal = NULL;
-        cleanup_sighand(tsk);
+        tsk->sighand = NULL;
         spin_unlock(&sighand->siglock);
         rcu_read_unlock();
 
+        __cleanup_sighand(sighand);
         clear_tsk_thread_flag(tsk,TIF_SIGPENDING);
         flush_sigqueue(&tsk->pending);
         if (sig) {
diff --git a/kernel/fork.c b/kernel/fork.c
index aa50c848fae7..b3f7a1bb5e55 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -803,12 +803,8 @@ static inline int copy_sighand(unsigned long clone_flags, struct task_struct * t
         return 0;
 }
 
-void cleanup_sighand(struct task_struct *tsk)
+void __cleanup_sighand(struct sighand_struct *sighand)
 {
-        struct sighand_struct * sighand = tsk->sighand;
-
-        /* Ok, we're done with the signal handlers */
-        tsk->sighand = NULL;
         if (atomic_dec_and_test(&sighand->count))
                 kmem_cache_free(sighand_cachep, sighand);
 }
@@ -1233,7 +1229,7 @@ bad_fork_cleanup_mm:
 bad_fork_cleanup_signal:
         cleanup_signal(p);
 bad_fork_cleanup_sighand:
-        cleanup_sighand(p);
+        __cleanup_sighand(p->sighand);
 bad_fork_cleanup_fs:
         exit_fs(p); /* blocking */
 bad_fork_cleanup_files: