Merge branch 'linux-2.6' into for-2.6.24

1 files changed, 0 insertions, 9 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 06b24b3aa370..993369ee94d1 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -24,7 +24,6 @@
 #include <linux/pid_namespace.h>
 #include <linux/ptrace.h>
 #include <linux/profile.h>
-#include <linux/signalfd.h>
 #include <linux/mount.h>
 #include <linux/proc_fs.h>
 #include <linux/kthread.h>
@@ -86,14 +85,6 @@ static void __exit_signal(struct task_struct *tsk)
         sighand = rcu_dereference(tsk->sighand);
         spin_lock(&sighand->siglock);
 
-        /*
-         * Notify that this sighand has been detached. This must
-         * be called with the tsk->sighand lock held. Also, this
-         * access tsk->sighand internally, so it must be called
-         * before tsk->sighand is reset.
-         */
-        signalfd_detach_locked(tsk);
-
         posix_cpu_timers_exit(tsk);
         if (atomic_dec_and_test(&sig->count))
                 posix_cpu_timers_exit_group(tsk);