Commit 3b9f5dcf authored by Linus Torvalds's avatar Linus Torvalds

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.
parent 461a50a3
...@@ -610,7 +610,6 @@ NORET_TYPE void do_exit(long code) ...@@ -610,7 +610,6 @@ NORET_TYPE void do_exit(long code)
if (tsk->pid == 1) if (tsk->pid == 1)
panic("Attempted to kill init!"); panic("Attempted to kill init!");
tsk->flags |= PF_EXITING; 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())) if (unlikely(preempt_count()))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment