diff options
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index ae2b92be5fae..35c8ec2ba03a 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include <linux/cn_proc.h> | 40 | #include <linux/cn_proc.h> |
41 | #include <linux/mutex.h> | 41 | #include <linux/mutex.h> |
42 | #include <linux/futex.h> | 42 | #include <linux/futex.h> |
43 | #include <linux/compat.h> | ||
44 | #include <linux/pipe_fs_i.h> | 43 | #include <linux/pipe_fs_i.h> |
45 | #include <linux/audit.h> /* for audit_free() */ | 44 | #include <linux/audit.h> /* for audit_free() */ |
46 | #include <linux/resource.h> | 45 | #include <linux/resource.h> |
@@ -54,6 +53,10 @@ | |||
54 | #include <asm/pgtable.h> | 53 | #include <asm/pgtable.h> |
55 | #include <asm/mmu_context.h> | 54 | #include <asm/mmu_context.h> |
56 | 55 | ||
56 | DEFINE_TRACE(sched_process_free); | ||
57 | DEFINE_TRACE(sched_process_exit); | ||
58 | DEFINE_TRACE(sched_process_wait); | ||
59 | |||
57 | static void exit_mm(struct task_struct * tsk); | 60 | static void exit_mm(struct task_struct * tsk); |
58 | 61 | ||
59 | static inline int task_detached(struct task_struct *p) | 62 | static inline int task_detached(struct task_struct *p) |
@@ -1059,14 +1062,6 @@ NORET_TYPE void do_exit(long code) | |||
1059 | exit_itimers(tsk->signal); | 1062 | exit_itimers(tsk->signal); |
1060 | } | 1063 | } |
1061 | acct_collect(code, group_dead); | 1064 | acct_collect(code, group_dead); |
1062 | #ifdef CONFIG_FUTEX | ||
1063 | if (unlikely(tsk->robust_list)) | ||
1064 | exit_robust_list(tsk); | ||
1065 | #ifdef CONFIG_COMPAT | ||
1066 | if (unlikely(tsk->compat_robust_list)) | ||
1067 | compat_exit_robust_list(tsk); | ||
1068 | #endif | ||
1069 | #endif | ||
1070 | if (group_dead) | 1065 | if (group_dead) |
1071 | tty_audit_exit(); | 1066 | tty_audit_exit(); |
1072 | if (unlikely(tsk->audit_context)) | 1067 | if (unlikely(tsk->audit_context)) |