Merge tag 'upstream-3.18-rc1-v2' of git://git.infradead.org/linux-ubifs

[cascardo/linux.git] / kernel / sched / stop_task.c

diff --git a/kernel/sched/stop_task.c b/kernel/sched/stop_task.c
index bfe0eda..67426e5 100644 (file)
--- a/kernel/sched/stop_task.c
+++ b/kernel/sched/stop_task.c
@@ -28,7 +28,7 @@ pick_next_task_stop(struct rq *rq, struct task_struct *prev)
 {
        struct task_struct *stop = rq->stop;
 
-       if (!stop || !stop->on_rq)
+       if (!stop || !task_on_rq_queued(stop))
                return NULL;
 
        put_prev_task(rq, prev);