Merge tag 'devicetree-fixes-for-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / kernel / sched / topology.c

diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index f53f89df837d84786635a302209e45f4cc72da85..f751ce0b783e57eff53f4d5feb73be1859d05cd6 100644 (file)
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -1344,11 +1344,6 @@ sd_init(struct sched_domain_topology_level *tl,
                .imbalance_pct          = 125,
 
                .cache_nice_tries       = 0,
-               .busy_idx               = 0,
-               .idle_idx               = 0,
-               .newidle_idx            = 0,
-               .wake_idx               = 0,
-               .forkexec_idx           = 0,
 
                .flags                  = 1*SD_LOAD_BALANCE
                                        | 1*SD_BALANCE_NEWIDLE
@@ -1400,13 +1395,10 @@ sd_init(struct sched_domain_topology_level *tl,
        } else if (sd->flags & SD_SHARE_PKG_RESOURCES) {
                sd->imbalance_pct = 117;
                sd->cache_nice_tries = 1;
-               sd->busy_idx = 2;
 
 #ifdef CONFIG_NUMA
        } else if (sd->flags & SD_NUMA) {
                sd->cache_nice_tries = 2;
-               sd->busy_idx = 3;
-               sd->idle_idx = 2;
 
                sd->flags &= ~SD_PREFER_SIBLING;
                sd->flags |= SD_SERIALIZE;
@@ -1419,8 +1411,6 @@ sd_init(struct sched_domain_topology_level *tl,
 #endif
        } else {
                sd->cache_nice_tries = 1;
-               sd->busy_idx = 2;
-               sd->idle_idx = 1;
        }
 
        /*
@@ -1884,10 +1874,10 @@ static struct sched_domain_topology_level
        unsigned long cap;
 
        /* Is there any asymmetry? */
-       cap = arch_scale_cpu_capacity(NULL, cpumask_first(cpu_map));
+       cap = arch_scale_cpu_capacity(cpumask_first(cpu_map));
 
        for_each_cpu(i, cpu_map) {
-               if (arch_scale_cpu_capacity(NULL, i) != cap) {
+               if (arch_scale_cpu_capacity(i) != cap) {
                        asym = true;
                        break;
                }
@@ -1902,7 +1892,7 @@ static struct sched_domain_topology_level
         * to everyone.
         */
        for_each_cpu(i, cpu_map) {
-               unsigned long max_capacity = arch_scale_cpu_capacity(NULL, i);
+               unsigned long max_capacity = arch_scale_cpu_capacity(i);
                int tl_id = 0;
 
                for_each_sd_topology(tl) {
@@ -1912,7 +1902,7 @@ static struct sched_domain_topology_level
                        for_each_cpu_and(j, tl->mask(i), cpu_map) {
                                unsigned long capacity;
 
-                               capacity = arch_scale_cpu_capacity(NULL, j);
+                               capacity = arch_scale_cpu_capacity(j);
 
                                if (capacity <= max_capacity)
                                        continue;