aboutsummaryrefslogtreecommitdiff
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-19 18:01:24 -0400
committerLen Brown <len.brown@intel.com>2006-06-19 18:01:24 -0400
commitae6c859b7dcd708efadf1c76279c33db213e3506 (patch)
treec18c2e94537d5e3d4fde5bf52800333b7c237048 /kernel/exit.c
parent5b4b7a236e7787f16af4e15a6253d46d8e794be6 (diff)
parent427abfa28afedffadfca9dd8b067eb6d36bac53f (diff)
merge linus into release branch
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index e95b9328221..e06d0c10a24 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -881,14 +881,6 @@ fastcall NORET_TYPE void do_exit(long code)
tsk->flags |= PF_EXITING;
- /*
- * Make sure we don't try to process any timer firings
- * while we are already exiting.
- */
- tsk->it_virt_expires = cputime_zero;
- tsk->it_prof_expires = cputime_zero;
- tsk->it_sched_expires = 0;
-
if (unlikely(in_atomic()))
printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
current->comm, current->pid,