diff options
author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-18 13:21:24 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-18 13:21:24 -0400 |
commit | f9d1fe9630b94007902987c39d19f04dc6256eac (patch) | |
tree | 1fbe757adc72469ddbc3c1e4132392164b2e0271 /kernel/exit.c | |
parent | 54258a8a2e81b11e486068f1cfab9fe4746b8420 (diff) | |
parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) |
Merge /spare/repo/linux-2.6/
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); |