[PATCH 07/10] sched/fair: Remove ifdefs in waker_affine_idler_llc

From: Srikar Dronamraju
Date: Thu Apr 22 2021 - 06:24:39 EST


Now that idle callbacks are updating nr_busy_cpus, remove ifdefs in
wake_affine_idler_llc

Cc: LKML <linux-kernel@xxxxxxxxxxxxxxx>
Cc: Gautham R Shenoy <ego@xxxxxxxxxxxxxxxxxx>
Cc: Parth Shah <parth@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Valentin Schneider <valentin.schneider@xxxxxxx>
Cc: Dietmar Eggemann <dietmar.eggemann@xxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Vincent Guittot <vincent.guittot@xxxxxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxxx>
Signed-off-by: Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx>
---
kernel/sched/fair.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 00bcf1d861b5..8f752f77b76f 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5870,9 +5870,7 @@ wake_affine_weight(struct sched_domain *sd, struct task_struct *p,

static int wake_affine_idler_llc(struct task_struct *p, int this_cpu, int prev_cpu, int sync)
{
-#ifdef CONFIG_NO_HZ_COMMON
int pnr_busy, pllc_size, tnr_busy, tllc_size;
-#endif
struct sched_domain_shared *tsds, *psds;
int diff;

@@ -5909,7 +5907,6 @@ static int wake_affine_idler_llc(struct task_struct *p, int this_cpu, int prev_c
}
}

-#ifdef CONFIG_NO_HZ_COMMON
tnr_busy = atomic_read(&tsds->nr_busy_cpus);
pnr_busy = atomic_read(&psds->nr_busy_cpus);

@@ -5924,7 +5921,6 @@ static int wake_affine_idler_llc(struct task_struct *p, int this_cpu, int prev_c
return this_cpu;
if (diff < 0)
return prev_cpu;
-#endif /* CONFIG_NO_HZ_COMMON */

return nr_cpumask_bits;
}
--
2.18.2