Skip to content

Commit ace670d

Browse files
Joel Fernandespundiramit
authored andcommitted
Revert "sched/core: Warn if ENERGY_AWARE is enabled but data is missing"
This reverts commit a212997. Change-Id: Idb707c80788d8b6d26d400a59d9b14f854cce89f
1 parent 05a1b4b commit ace670d

1 file changed

Lines changed: 0 additions & 22 deletions

File tree

kernel/sched/core.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@
9191
#include <trace/events/sched.h>
9292
#include "walt.h"
9393

94-
static bool have_sched_energy_data(void);
95-
9694
DEFINE_MUTEX(sched_domains_mutex);
9795
DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
9896

@@ -195,10 +193,6 @@ static int sched_feat_set(char *cmp)
195193
sysctl_sched_features &= ~(1UL << i);
196194
sched_feat_disable(i);
197195
} else {
198-
if (i == __SCHED_FEAT_ENERGY_AWARE)
199-
WARN(!have_sched_energy_data(),
200-
"Missing sched energy data\n");
201-
202196
sysctl_sched_features |= (1UL << i);
203197
sched_feat_enable(i);
204198
}
@@ -6655,19 +6649,6 @@ static void init_sched_groups_capacity(int cpu, struct sched_domain *sd)
66556649
atomic_set(&sg->sgc->nr_busy_cpus, sg->group_weight);
66566650
}
66576651

6658-
static bool have_sched_energy_data(void)
6659-
{
6660-
int cpu;
6661-
6662-
for_each_possible_cpu(cpu) {
6663-
if (!rcu_dereference(per_cpu(sd_scs, cpu)) ||
6664-
!rcu_dereference(per_cpu(sd_ea, cpu)))
6665-
return false;
6666-
}
6667-
6668-
return true;
6669-
}
6670-
66716652
/*
66726653
* Check that the per-cpu provided sd energy data is consistent for all cpus
66736654
* within the mask.
@@ -7480,9 +7461,6 @@ static int build_sched_domains(const struct cpumask *cpu_map,
74807461
}
74817462
rcu_read_unlock();
74827463

7483-
WARN(sched_feat(ENERGY_AWARE) && !have_sched_energy_data(),
7484-
"Missing data for energy aware scheduling\n");
7485-
74867464
ret = 0;
74877465
error:
74887466
__free_domain_allocs(&d, alloc_state, cpu_map);

0 commit comments

Comments
 (0)