Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ff7ba5e authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by Greg Kroah-Hartman
Browse files

sched/deadline,rt: Remove unused parameter from pick_next_[rt|dl]_entity() 



[ Upstream commit 821aecd09e5ad2f8d4c3d8195333d272b392f7d3 ]

The `struct rq *rq` parameter isn't used. Remove it.

Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJuri Lelli <juri.lelli@redhat.com>
Link: https://lore.kernel.org/r/20220302183433.333029-7-dietmar.eggemann@arm.com


Stable-dep-of: 7c4a5b89a0b5 ("sched/rt: pick_next_rt_entity(): check list_entry")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ee986d80

kernel/sched/deadline.c

+2 −3
Original line number Diff line number Diff line
@@ -1793,8 +1793,7 @@ static void set_next_task_dl(struct rq *rq, struct task_struct *p, bool first) 
	deadline_queue_push_tasks(rq);

}



static struct sched_dl_entity *pick_next_dl_entity(struct rq *rq,

						   struct dl_rq *dl_rq)

static struct sched_dl_entity *pick_next_dl_entity(struct dl_rq *dl_rq)

{

	struct rb_node *left = rb_first_cached(&dl_rq->root);
@@ -1816,7 +1815,7 @@ pick_next_task_dl(struct rq *rq, struct task_struct *prev, struct rq_flags *rf) 
	if (!sched_dl_runnable(rq))

		return NULL;



	dl_se = pick_next_dl_entity(rq, dl_rq);

	dl_se = pick_next_dl_entity(dl_rq);

	BUG_ON(!dl_se);

	p = dl_task_of(dl_se);

	set_next_task_dl(rq, p, true);

kernel/sched/rt.c

+2 −3
Original line number Diff line number Diff line
@@ -1550,8 +1550,7 @@ static inline void set_next_task_rt(struct rq *rq, struct task_struct *p, bool f 
	rt_queue_push_tasks(rq);

}



static struct sched_rt_entity *pick_next_rt_entity(struct rq *rq,

						   struct rt_rq *rt_rq)

static struct sched_rt_entity *pick_next_rt_entity(struct rt_rq *rt_rq)

{

	struct rt_prio_array *array = &rt_rq->active;

	struct sched_rt_entity *next = NULL;
@@ -1573,7 +1572,7 @@ static struct task_struct *_pick_next_task_rt(struct rq *rq) 
	struct rt_rq *rt_rq  = &rq->rt;



	do {

		rt_se = pick_next_rt_entity(rq, rt_rq);

		rt_se = pick_next_rt_entity(rt_rq);

		BUG_ON(!rt_se);

		rt_rq = group_rt_rq(rt_se);

	} while (rt_rq);