The following commit has been merged into the sched/core branch of tip: Commit-ID: b6dd6984832a2868f78879fce30d6965ae899d02 Gitweb: https://git.kernel.org/tip/b6dd6984832a2868f78879fce30d6965ae899d02 Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Fri, 06 Oct 2023 12:25:17 +02:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Mon, 09 Oct 2023 12:21:23 +02:00 sched/nohz: Use consistent variable names in find_new_ilb() and kick_ilb() Use 'ilb_cpu' consistently in both functions. Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Reviewed-by: Joel Fernandes (Google) <joel@xxxxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20231006102518.2452758-3-mingo@xxxxxxxxxx --- kernel/sched/fair.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2b63a14..f82b301 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -11514,18 +11514,18 @@ static inline int on_null_domain(struct rq *rq) */ static inline int find_new_ilb(void) { - int ilb; const struct cpumask *hk_mask; + int ilb_cpu; hk_mask = housekeeping_cpumask(HK_TYPE_MISC); - for_each_cpu_and(ilb, nohz.idle_cpus_mask, hk_mask) { + for_each_cpu_and(ilb_cpu, nohz.idle_cpus_mask, hk_mask) { - if (ilb == smp_processor_id()) + if (ilb_cpu == smp_processor_id()) continue; - if (idle_cpu(ilb)) - return ilb; + if (idle_cpu(ilb_cpu)) + return ilb_cpu; } return nr_cpu_ids;