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 | |
| parent | 4be44fcd3bf648b782f4460fd06dfae6c42ded4b (diff) | |
| parent | c306895167c8384b88bc02945a0d226a04218fa5 (diff) | |
Merge ../to-linus
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/exit.c | 4 | ||||
| -rw-r--r-- | kernel/posix-timers.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 9d1b10ed013..5b0fb9f09f2 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -829,8 +829,10 @@ fastcall NORET_TYPE void do_exit(long code) acct_update_integrals(tsk); update_mem_hiwater(tsk); group_dead = atomic_dec_and_test(&tsk->signal->live); - if (group_dead) + if (group_dead) { + del_timer_sync(&tsk->signal->real_timer); acct_process(code); + } exit_mm(tsk); exit_sem(tsk); diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 10b2ad749d1..38798a2ff99 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -1166,7 +1166,6 @@ void exit_itimers(struct signal_struct *sig) tmr = list_entry(sig->posix_timers.next, struct k_itimer, list); itimer_delete(tmr); } - del_timer_sync(&sig->real_timer); } /* |