From 3b9f5dcf65412063b8e5cc249ff1d888b07b8d8e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 19 Sep 2002 03:36:46 -0700 Subject: Remove bogus timer optimization - even if the timer isn't pending, it might be actively running on another CPU, so we still need to do the synchronous wait. --- kernel/exit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kernel/exit.c') diff --git a/kernel/exit.c b/kernel/exit.c index 6d14cb4d7090..4b051cb290c2 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -610,8 +610,7 @@ NORET_TYPE void do_exit(long code) if (tsk->pid == 1) panic("Attempted to kill init!"); tsk->flags |= PF_EXITING; - if (timer_pending(&tsk->real_timer)) - del_timer_sync(&tsk->real_timer); + del_timer_sync(&tsk->real_timer); if (unlikely(preempt_count())) printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n", -- cgit v1.2.3