diff options
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 2d8be7ebb0f7..61ba5b4b10cf 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -53,6 +53,10 @@ | |||
| 53 | #include <asm/pgtable.h> | 53 | #include <asm/pgtable.h> |
| 54 | #include <asm/mmu_context.h> | 54 | #include <asm/mmu_context.h> |
| 55 | 55 | ||
| 56 | DEFINE_TRACE(sched_process_free); | ||
| 57 | DEFINE_TRACE(sched_process_exit); | ||
| 58 | DEFINE_TRACE(sched_process_wait); | ||
| 59 | |||
| 56 | static void exit_mm(struct task_struct * tsk); | 60 | static void exit_mm(struct task_struct * tsk); |
| 57 | 61 | ||
| 58 | static inline int task_detached(struct task_struct *p) | 62 | static inline int task_detached(struct task_struct *p) |
| @@ -1123,7 +1127,6 @@ NORET_TYPE void do_exit(long code) | |||
| 1123 | preempt_disable(); | 1127 | preempt_disable(); |
| 1124 | /* causes final put_task_struct in finish_task_switch(). */ | 1128 | /* causes final put_task_struct in finish_task_switch(). */ |
| 1125 | tsk->state = TASK_DEAD; | 1129 | tsk->state = TASK_DEAD; |
| 1126 | |||
| 1127 | schedule(); | 1130 | schedule(); |
| 1128 | BUG(); | 1131 | BUG(); |
| 1129 | /* Avoid "noreturn function does return". */ | 1132 | /* Avoid "noreturn function does return". */ |
| @@ -1321,10 +1324,10 @@ static int wait_task_zombie(struct task_struct *p, int options, | |||
| 1321 | * group, which consolidates times for all threads in the | 1324 | * group, which consolidates times for all threads in the |
| 1322 | * group including the group leader. | 1325 | * group including the group leader. |
| 1323 | */ | 1326 | */ |
| 1327 | thread_group_cputime(p, &cputime); | ||
| 1324 | spin_lock_irq(&p->parent->sighand->siglock); | 1328 | spin_lock_irq(&p->parent->sighand->siglock); |
| 1325 | psig = p->parent->signal; | 1329 | psig = p->parent->signal; |
| 1326 | sig = p->signal; | 1330 | sig = p->signal; |
| 1327 | thread_group_cputime(p, &cputime); | ||
| 1328 | psig->cutime = | 1331 | psig->cutime = |
| 1329 | cputime_add(psig->cutime, | 1332 | cputime_add(psig->cutime, |
| 1330 | cputime_add(cputime.utime, | 1333 | cputime_add(cputime.utime, |
