[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>
git-mirror · Aug 4, 2005 · c306895 · c306895
1 parent e8ed11b
commit c306895
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     }
     /*
@@ Expand Down @@