[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>

authored by Andrew Morton and committed by Linus Torvalds c3068951 e8ed11b9

+3 -2
+3 -1
kernel/exit.c
··· 829 acct_update_integrals(tsk); 830 update_mem_hiwater(tsk); 831 group_dead = atomic_dec_and_test(&tsk->signal->live); 832 - if (group_dead) 833 acct_process(code); 834 exit_mm(tsk); 835 836 exit_sem(tsk);
··· 829 acct_update_integrals(tsk); 830 update_mem_hiwater(tsk); 831 group_dead = atomic_dec_and_test(&tsk->signal->live); 832 + if (group_dead) { 833 + del_timer_sync(&tsk->signal->real_timer); 834 acct_process(code); 835 + } 836 exit_mm(tsk); 837 838 exit_sem(tsk);
-1
kernel/posix-timers.c
··· 1166 tmr = list_entry(sig->posix_timers.next, struct k_itimer, list); 1167 itimer_delete(tmr); 1168 } 1169 - del_timer_sync(&sig->real_timer); 1170 } 1171 1172 /*
··· 1166 tmr = list_entry(sig->posix_timers.next, struct k_itimer, list); 1167 itimer_delete(tmr); 1168 } 1169 } 1170 1171 /*