[PATCH] timer exit cleanup

Do all timer zapping in exit_itimers. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
git-mirror · Jun 17, 2005 · caf2857 · caf2857
1 parent 9700808
commit caf2857
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/kernel/exit.c b/kernel/exit.c
@@ -811,10 +811,8 @@ 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) {
- 		del_timer_sync(&tsk->signal->real_timer);
+	if (group_dead)
 		acct_process(code);
-	}
 	exit_mm(tsk);
 
 	exit_sem(tsk);

diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
@@ -1197,6 +1197,7 @@ 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 / @@ -1197,6 +1197,7 @@ 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 @@