diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
tree | f4421227b3065e786c9041cf0ce0073a249e011b /kernel/exit.c | |
parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index edaa50b5bbfa..2ef2ad540201 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -811,10 +811,8 @@ fastcall NORET_TYPE void do_exit(long code) | |||
811 | acct_update_integrals(tsk); | 811 | acct_update_integrals(tsk); |
812 | update_mem_hiwater(tsk); | 812 | update_mem_hiwater(tsk); |
813 | group_dead = atomic_dec_and_test(&tsk->signal->live); | 813 | group_dead = atomic_dec_and_test(&tsk->signal->live); |
814 | if (group_dead) { | 814 | if (group_dead) |
815 | del_timer_sync(&tsk->signal->real_timer); | ||
816 | acct_process(code); | 815 | acct_process(code); |
817 | } | ||
818 | exit_mm(tsk); | 816 | exit_mm(tsk); |
819 | 817 | ||
820 | exit_sem(tsk); | 818 | exit_sem(tsk); |