diff options
author | Joel Fernandes <joelaf@google.com> | 2017-10-30 21:13:39 +0000 |
---|---|---|
committer | Joel Fernandes <joelaf@google.com> | 2017-10-30 21:15:39 +0000 |
commit | 3a353d6cea7db5b758d6cec01398cb932cdef919 (patch) | |
tree | a4168b0dae5a2ce1943240f68ffb36cf5a47f54e /kernel | |
parent | c2f18159a2f3c2da04445fe4295da050e4a7a1d9 (diff) |
Revert "sched/core: Warn if ENERGY_AWARE is enabled but data is missing"
This reverts commit a21299785a502ca4b3592a0f977aa1202b105260.
Change-Id: Idb707c80788d8b6d26d400a59d9b14f854cce89f
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched/core.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 4f11b84eaf0a..18d607f9a417 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -91,8 +91,6 @@ #include <trace/events/sched.h> #include "walt.h" -static bool have_sched_energy_data(void); - DEFINE_MUTEX(sched_domains_mutex); DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); @@ -195,10 +193,6 @@ static int sched_feat_set(char *cmp) sysctl_sched_features &= ~(1UL << i); sched_feat_disable(i); } else { - if (i == __SCHED_FEAT_ENERGY_AWARE) - WARN(!have_sched_energy_data(), - "Missing sched energy data\n"); - sysctl_sched_features |= (1UL << i); sched_feat_enable(i); } @@ -6655,19 +6649,6 @@ static void init_sched_groups_capacity(int cpu, struct sched_domain *sd) atomic_set(&sg->sgc->nr_busy_cpus, sg->group_weight); } -static bool have_sched_energy_data(void) -{ - int cpu; - - for_each_possible_cpu(cpu) { - if (!rcu_dereference(per_cpu(sd_scs, cpu)) || - !rcu_dereference(per_cpu(sd_ea, cpu))) - return false; - } - - return true; -} - /* * Check that the per-cpu provided sd energy data is consistent for all cpus * within the mask. @@ -7480,9 +7461,6 @@ static int build_sched_domains(const struct cpumask *cpu_map, } rcu_read_unlock(); - WARN(sched_feat(ENERGY_AWARE) && !have_sched_energy_data(), - "Missing data for energy aware scheduling\n"); - ret = 0; error: __free_domain_allocs(&d, alloc_state, cpu_map); |