diff options
author | Len Brown <len.brown@intel.com> | 2005-08-05 00:49:06 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-05 00:49:06 -0400 |
commit | c202ac9fbdb64145f034be266d6ee88c98b40aa8 (patch) | |
tree | f654a0a0d3f87cf82c3026670f9dda551dc82b2f /kernel/exit.c | |
parent | 4be44fcd3bf648b782f4460fd06dfae6c42ded4b (diff) | |
parent | c306895167c8384b88bc02945a0d226a04218fa5 (diff) |
Merge ../to-linus
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 9d1b10ed0135..5b0fb9f09f21 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -829,8 +829,10 @@ fastcall NORET_TYPE void do_exit(long code) | |||
829 | acct_update_integrals(tsk); | 829 | acct_update_integrals(tsk); |
830 | update_mem_hiwater(tsk); | 830 | update_mem_hiwater(tsk); |
831 | group_dead = atomic_dec_and_test(&tsk->signal->live); | 831 | group_dead = atomic_dec_and_test(&tsk->signal->live); |
832 | if (group_dead) | 832 | if (group_dead) { |
833 | del_timer_sync(&tsk->signal->real_timer); | ||
833 | acct_process(code); | 834 | acct_process(code); |
835 | } | ||
834 | exit_mm(tsk); | 836 | exit_mm(tsk); |
835 | 837 | ||
836 | exit_sem(tsk); | 838 | exit_sem(tsk); |