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.

diff --git a/kernel/exit.c b/kernel/exit.c
index 6d14cb4d7090a2c30524aee0505da4085156188c..4b051cb290c2f29d855f8fb03446ff7df044cabd 100644 (file)
--- 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",