Merge tag 'kbuild-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

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

diff --git a/kernel/sched/stop_task.c b/kernel/sched/stop_task.c
index c0640739e05ee8f07318920cd3132ef18427f3bc..4c9e9975684fa8cd633ba05008493499994eb99a 100644 (file)
--- a/kernel/sched/stop_task.c
+++ b/kernel/sched/stop_task.c
@@ -29,20 +29,17 @@ check_preempt_curr_stop(struct rq *rq, struct task_struct *p, int flags)
        /* we're never preempted */
 }
 
-static void set_next_task_stop(struct rq *rq, struct task_struct *stop)
+static void set_next_task_stop(struct rq *rq, struct task_struct *stop, bool first)
 {
        stop->se.exec_start = rq_clock_task(rq);
 }
 
-static struct task_struct *
-pick_next_task_stop(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
+static struct task_struct *pick_next_task_stop(struct rq *rq)
 {
-       WARN_ON_ONCE(prev || rf);
-
        if (!sched_stop_runnable(rq))
                return NULL;
 
-       set_next_task_stop(rq, rq->stop);
+       set_next_task_stop(rq, rq->stop, true);
        return rq->stop;
 }