diff options
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 9578c1ae19ca..993369ee94d1 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/pid_namespace.h> | 24 | #include <linux/pid_namespace.h> |
25 | #include <linux/ptrace.h> | 25 | #include <linux/ptrace.h> |
26 | #include <linux/profile.h> | 26 | #include <linux/profile.h> |
27 | #include <linux/signalfd.h> | ||
28 | #include <linux/mount.h> | 27 | #include <linux/mount.h> |
29 | #include <linux/proc_fs.h> | 28 | #include <linux/proc_fs.h> |
30 | #include <linux/kthread.h> | 29 | #include <linux/kthread.h> |
@@ -86,14 +85,6 @@ static void __exit_signal(struct task_struct *tsk) | |||
86 | sighand = rcu_dereference(tsk->sighand); | 85 | sighand = rcu_dereference(tsk->sighand); |
87 | spin_lock(&sighand->siglock); | 86 | spin_lock(&sighand->siglock); |
88 | 87 | ||
89 | /* | ||
90 | * Notify that this sighand has been detached. This must | ||
91 | * be called with the tsk->sighand lock held. Also, this | ||
92 | * access tsk->sighand internally, so it must be called | ||
93 | * before tsk->sighand is reset. | ||
94 | */ | ||
95 | signalfd_detach_locked(tsk); | ||
96 | |||
97 | posix_cpu_timers_exit(tsk); | 88 | posix_cpu_timers_exit(tsk); |
98 | if (atomic_dec_and_test(&sig->count)) | 89 | if (atomic_dec_and_test(&sig->count)) |
99 | posix_cpu_timers_exit_group(tsk); | 90 | posix_cpu_timers_exit_group(tsk); |
@@ -975,6 +966,7 @@ fastcall NORET_TYPE void do_exit(long code) | |||
975 | if (unlikely(tsk->audit_context)) | 966 | if (unlikely(tsk->audit_context)) |
976 | audit_free(tsk); | 967 | audit_free(tsk); |
977 | 968 | ||
969 | tsk->exit_code = code; | ||
978 | taskstats_exit(tsk, group_dead); | 970 | taskstats_exit(tsk, group_dead); |
979 | 971 | ||
980 | exit_mm(tsk); | 972 | exit_mm(tsk); |
@@ -996,7 +988,6 @@ fastcall NORET_TYPE void do_exit(long code) | |||
996 | if (tsk->binfmt) | 988 | if (tsk->binfmt) |
997 | module_put(tsk->binfmt->module); | 989 | module_put(tsk->binfmt->module); |
998 | 990 | ||
999 | tsk->exit_code = code; | ||
1000 | proc_exit_connector(tsk); | 991 | proc_exit_connector(tsk); |
1001 | exit_task_namespaces(tsk); | 992 | exit_task_namespaces(tsk); |
1002 | exit_notify(tsk); | 993 | exit_notify(tsk); |