diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-08-04 16:49:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-04 16:57:49 -0700 |
| commit | c306895167c8384b88bc02945a0d226a04218fa5 (patch) | |
| tree | d3f298c9cf8f36787acae2c829e64f05a392162c /kernel | |
| parent | e8ed11b9dc07df0134248542ca8e7d40751a6052 (diff) | |
| download | linux-stable-c306895167c8384b88bc02945a0d226a04218fa5.tar.gz linux-stable-c306895167c8384b88bc02945a0d226a04218fa5.tar.bz2 linux-stable-c306895167c8384b88bc02945a0d226a04218fa5.zip | |
[PATCH] revert "timer exit cleanup"
Revert this June 17 patch: it broke persistence of timers across execve().
Cc: Roland McGrath <roland@redhat.com>
Cc: george anzinger <george@mvista.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 9d1b10ed0135..5b0fb9f09f21 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 10b2ad749d14..38798a2ff994 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); } /* |