tree d3f298c9cf8f36787acae2c829e64f05a392162c
parent e8ed11b9dc07df0134248542ca8e7d40751a6052
author Andrew Morton <[EMAIL PROTECTED]> Fri, 05 Aug 2005 06:49:32 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Fri, 05 Aug 2005 06:57:49 -0700
[PATCH] revert "timer exit cleanup"
Revert this June 17 patch: it broke persistence of timers across execve().
Cc: Roland McGrath <[EMAIL PROTECTED]>
Cc: george anzinger <george@mvista.com>
Cc: Ingo Molnar <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
kernel/exit.c | 4 +++-
kernel/posix-timers.c | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/exit.c b/kernel/exit.c
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -829,8 +829,10 @@ fastcall NORET_TYPE void do_exit(long co
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
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -1166,7 +1166,6 @@ void exit_itimers(struct signal_struct *
tmr = list_entry(sig->posix_timers.next, struct k_itimer, list);
itimer_delete(tmr);
}
- del_timer_sync(&sig->real_timer);
}
/*
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
