From 340ee42ec2495346bc9032bf795f48a7d00f429f Mon Sep 17 00:00:00 2001 From: Dietmar Eggemann Date: Thu, 1 Dec 2016 18:37:58 +0000 Subject: [PATCH] sched/fair: Do not force want_affine eq. true if EAS is enabled This lets us use Capacity-Aware Scheduling (CAS) if EAS is enabled. Change-Id: I2e647a201ea0b733d1487c3e153047a49fb22847 Signed-off-by: Dietmar Eggemann (cherry picked from commit 00b7da2ae58bf568529e67614980f77e275b8d29) Signed-off-by: Chris Redpath --- kernel/sched/fair.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 87c03eaacec4..976e7457b4fa 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6016,9 +6016,8 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f int sync = wake_flags & WF_SYNC; if (sd_flag & SD_BALANCE_WAKE) - want_affine = (!wake_wide(p) && !wake_cap(p, cpu, prev_cpu) - && cpumask_test_cpu(cpu, tsk_cpus_allowed(p))) || - energy_aware(); + want_affine = !wake_wide(p) && !wake_cap(p, cpu, prev_cpu) + && cpumask_test_cpu(cpu, tsk_cpus_allowed(p)); rcu_read_lock(); for_each_domain(cpu, tmp) { -- 2.34.1