sched/core: Remove redundant 'preempt' param from sched_class->yield_to_task()

Commit 6d1cafd8b56e ("sched: Resched proper CPU on yield_to()") moved
the code to resched the CPU from yield_to_task_fair() to yield_to()
making the preempt parameter in sched_class->yield_to_task()
unnecessary. Remove it. No other sched_class implements yield_to_task().

Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200603080304.16548-3-dietmar.eggemann@arm.com

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 8f360326861ec866d5ffb206f8a4c7bc47520350..9c89b0eaf796176c44cbd918454ce701a04279c9 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5810,7 +5810,7 @@ again:
        if (task_running(p_rq, p) || p->state)
                goto out_unlock;
 
-       yielded = curr->sched_class->yield_to_task(rq, p, preempt);
+       yielded = curr->sched_class->yield_to_task(rq, p);
        if (yielded) {
                schedstat_inc(rq->yld_count);
                /*

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index cbcb2f71599bbb36c2818536a189c234d70827c5..6a4dab2f7c07b06c611aee3eabcebe00361feef5 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7157,7 +7157,7 @@ static void yield_task_fair(struct rq *rq)
        set_skip_buddy(se);
 }
 
-static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preempt)
+static bool yield_to_task_fair(struct rq *rq, struct task_struct *p)
 {
        struct sched_entity *se = &p->se;
 

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 1d4e94c1e5fedbb4b6f39db259540cc1eb3cbb77..8d5d06881294b21cbe0dd5c5e69726f32b5b3315 100644 (file)
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1748,7 +1748,7 @@ struct sched_class {
        void (*enqueue_task) (struct rq *rq, struct task_struct *p, int flags);
        void (*dequeue_task) (struct rq *rq, struct task_struct *p, int flags);
        void (*yield_task)   (struct rq *rq);
-       bool (*yield_to_task)(struct rq *rq, struct task_struct *p, bool preempt);
+       bool (*yield_to_task)(struct rq *rq, struct task_struct *p);
 
        void (*check_preempt_curr)(struct rq *rq, struct task_struct *p, int flags);