sched/topology: Kill SD_LOAD_BALANCE

That flag is set unconditionally in sd_init(), and no one checks for it
anymore. Remove it.

Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200415210512.805-5-valentin.schneider@arm.com

diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h
index 95253ad792b0c85ab020b026507b8283a08a09fb..fb11091129b3133ee8be0698abf11e8e688cb9d8 100644 (file)
--- a/include/linux/sched/topology.h
+++ b/include/linux/sched/topology.h
@@ -11,21 +11,20 @@
  */
 #ifdef CONFIG_SMP
 
-#define SD_LOAD_BALANCE                0x0001  /* Do load balancing on this domain. */
-#define SD_BALANCE_NEWIDLE     0x0002  /* Balance when about to become idle */
-#define SD_BALANCE_EXEC                0x0004  /* Balance on exec */
-#define SD_BALANCE_FORK                0x0008  /* Balance on fork, clone */
-#define SD_BALANCE_WAKE                0x0010  /* Balance on wakeup */
-#define SD_WAKE_AFFINE         0x0020  /* Wake task to waking CPU */
-#define SD_ASYM_CPUCAPACITY    0x0040  /* Domain members have different CPU capacities */
-#define SD_SHARE_CPUCAPACITY   0x0080  /* Domain members share CPU capacity */
-#define SD_SHARE_POWERDOMAIN   0x0100  /* Domain members share power domain */
-#define SD_SHARE_PKG_RESOURCES 0x0200  /* Domain members share CPU pkg resources */
-#define SD_SERIALIZE           0x0400  /* Only a single load balancing instance */
-#define SD_ASYM_PACKING                0x0800  /* Place busy groups earlier in the domain */
-#define SD_PREFER_SIBLING      0x1000  /* Prefer to place tasks in a sibling domain */
-#define SD_OVERLAP             0x2000  /* sched_domains of this level overlap */
-#define SD_NUMA                        0x4000  /* cross-node balancing */
+#define SD_BALANCE_NEWIDLE     0x0001  /* Balance when about to become idle */
+#define SD_BALANCE_EXEC                0x0002  /* Balance on exec */
+#define SD_BALANCE_FORK                0x0004  /* Balance on fork, clone */
+#define SD_BALANCE_WAKE                0x0008  /* Balance on wakeup */
+#define SD_WAKE_AFFINE         0x0010  /* Wake task to waking CPU */
+#define SD_ASYM_CPUCAPACITY    0x0020  /* Domain members have different CPU capacities */
+#define SD_SHARE_CPUCAPACITY   0x0040  /* Domain members share CPU capacity */
+#define SD_SHARE_POWERDOMAIN   0x0080  /* Domain members share power domain */
+#define SD_SHARE_PKG_RESOURCES 0x0100  /* Domain members share CPU pkg resources */
+#define SD_SERIALIZE           0x0200  /* Only a single load balancing instance */
+#define SD_ASYM_PACKING                0x0400  /* Place busy groups earlier in the domain */
+#define SD_PREFER_SIBLING      0x0800  /* Prefer to place tasks in a sibling domain */
+#define SD_OVERLAP             0x1000  /* sched_domains of this level overlap */
+#define SD_NUMA                        0x2000  /* cross-node balancing */
 
 #ifdef CONFIG_SCHED_SMT
 static inline int cpu_smt_flags(void)

diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index a9dc34a0ebc11b88a61e04d3e02f858c17f955d4..1d7b446fac7d6835f5a9d0da2b4c05c77c36260c 100644 (file)
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -1341,8 +1341,7 @@ sd_init(struct sched_domain_topology_level *tl,
 
                .cache_nice_tries       = 0,
 
-               .flags                  = 1*SD_LOAD_BALANCE
-                                       | 1*SD_BALANCE_NEWIDLE
+               .flags                  = 1*SD_BALANCE_NEWIDLE
                                        | 1*SD_BALANCE_EXEC
                                        | 1*SD_BALANCE_FORK
                                        | 0*SD_BALANCE_WAKE