The following commit has been merged into the sched/core branch of tip: Commit-ID: 13c2235b2b2870675195f0b551275d1abdd81068 Gitweb: https://git.kernel.org/tip/13c2235b2b2870675195f0b551275d1abdd81068 Author: Edmundo Carmona Antoranz <eantoranz@xxxxxxxxx> AuthorDate: Sat, 06 Mar 2021 15:07:39 -06:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Wed, 10 Mar 2021 09:51:49 +01:00 sched: Remove unnecessary variable from schedule_tail() Since 565790d28b1 (sched: Fix balance_callback(), 2020-05-11), there is no longer a need to reuse the result value of the call to finish_task_switch() inside schedule_tail(), therefore the variable used to hold that value (rq) is no longer needed. Signed-off-by: Edmundo Carmona Antoranz <eantoranz@xxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20210306210739.1370486-1-eantoranz@xxxxxxxxx --- kernel/sched/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d2629fd..28c4df6 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4253,8 +4253,6 @@ static struct rq *finish_task_switch(struct task_struct *prev) asmlinkage __visible void schedule_tail(struct task_struct *prev) __releases(rq->lock) { - struct rq *rq; - /* * New tasks start with FORK_PREEMPT_COUNT, see there and * finish_task_switch() for details. @@ -4264,7 +4262,7 @@ asmlinkage __visible void schedule_tail(struct task_struct *prev) * PREEMPT_COUNT kernels). */ - rq = finish_task_switch(prev); + finish_task_switch(prev); preempt_enable(); if (current->set_child_tid)