From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 17 Jun 2005 09:36:36 +0000 (+0200)
Subject: [PATCH] timer exit cleanup
X-Git-Tag: v2.6.12~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=caf2857ac6e0ba2651e722f05d5f7d3ec8ef2615;p=~shefty%2Frdma-dev.git

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

diff --git a/kernel/exit.c b/kernel/exit.c
index edaa50b5bbf..2ef2ad54020 100644
--- 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
index fd316c27226..cabb63fc9e1 100644
--- 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);
 }
 
 /*