aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-27 12:07:33 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-27 12:07:33 -0400
commita362f463a6d316d14daed0f817e151835ce97ff7 (patch)
tree99b510438f9c88860ae17f1233cf21be24a152e3 /kernel/exit.c
parent7a4ed937aa44acdeb8c6ba671509dc7b54b09d3a (diff)
Revert "remove false BUG_ON() from run_posix_cpu_timers()"
This reverts commit 3de463c7d9d58f8cf3395268230cb20a4c15bffa. Roland has another patch that allows us to leave the BUG_ON() in place by just making sure that the condition it tests for really is always true. That goes in next. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 4897977a1f4b..3b25b182d2be 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -825,6 +825,14 @@ fastcall NORET_TYPE void do_exit(long code)
825 825
826 tsk->flags |= PF_EXITING; 826 tsk->flags |= PF_EXITING;
827 827
828 /*
829 * Make sure we don't try to process any timer firings
830 * while we are already exiting.
831 */
832 tsk->it_virt_expires = cputime_zero;
833 tsk->it_prof_expires = cputime_zero;
834 tsk->it_sched_expires = 0;
835
828 if (unlikely(in_atomic())) 836 if (unlikely(in_atomic()))
829 printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n", 837 printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
830 current->comm, current->pid, 838 current->comm, current->pid,