---

yaml --- r: 2013 b: refs/heads/master c: caf2857 h: refs/heads/master i: 2011: 8bcd51c v: v3
git-mirror · Jun 17, 2005 · 9a77afb · 9a77afb
1 parent d45b623
commit 9a77afb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97008082eacab047c189028202e055280f799ace
+refs/heads/master: caf2857ac6e0ba2651e722f05d5f7d3ec8ef2615
diff --git a/trunk/kernel/exit.c b/trunk/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/trunk/kernel/posix-timers.c b/trunk/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 @@