|
@@ -6404,14 +6404,14 @@ void sched_move_task(struct task_struct *tsk)
|
|
|
|
|
|
if (queued)
|
|
if (queued)
|
|
dequeue_task(rq, tsk, DEQUEUE_SAVE | DEQUEUE_MOVE);
|
|
dequeue_task(rq, tsk, DEQUEUE_SAVE | DEQUEUE_MOVE);
|
|
- if (unlikely(running))
|
|
|
|
|
|
+ if (running)
|
|
put_prev_task(rq, tsk);
|
|
put_prev_task(rq, tsk);
|
|
|
|
|
|
sched_change_group(tsk, TASK_MOVE_GROUP);
|
|
sched_change_group(tsk, TASK_MOVE_GROUP);
|
|
|
|
|
|
if (queued)
|
|
if (queued)
|
|
enqueue_task(rq, tsk, ENQUEUE_RESTORE | ENQUEUE_MOVE);
|
|
enqueue_task(rq, tsk, ENQUEUE_RESTORE | ENQUEUE_MOVE);
|
|
- if (unlikely(running))
|
|
|
|
|
|
+ if (running)
|
|
set_curr_task(rq, tsk);
|
|
set_curr_task(rq, tsk);
|
|
|
|
|
|
task_rq_unlock(rq, tsk, &rf);
|
|
task_rq_unlock(rq, tsk, &rf);
|