diff options
| author | Brendan Jackman <brendan.jackman@arm.com> | 2017-06-29 17:24:29 +0100 |
|---|---|---|
| committer | Chris Redpath <chris.redpath@arm.com> | 2017-07-25 16:31:00 +0100 |
| commit | e76348ec5f7f4e37f827cfcee2ead8c1089912c4 (patch) | |
| tree | 84533f1acde8953c28cb5222dc1094593e1f23e9 /kernel | |
| parent | ebc28671a5a3a657c1f88fbde4be07c4ef395aef (diff) | |
Revert "sched/fair: ensure utilization signals are synchronized before use"
This reverts commit 83f462daa328f2f42c3c1f7f5277f71e3fa0f750.
Change-Id: I37ba36da61df2beb3a005557d9b673027f446916
Signed-off-by: Brendan Jackman <brendan.jackman@arm.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/fair.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 90b44c6cca37..04eb6c66a78b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6573,16 +6573,9 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f int want_affine = 0; int sync = wake_flags & WF_SYNC; - if (sd_flag & SD_BALANCE_WAKE) { - /* - * do wake_cap unconditionally as it causes task and cpu - * utilization to be synced, and we need that for energy - * aware wakeups - */ - int _wake_cap = wake_cap(p, cpu, prev_cpu); - want_affine = !wake_wide(p) && !_wake_cap + 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)); - } if (energy_aware() && !(cpu_rq(prev_cpu)->rd->overutilized)) return select_energy_cpu_brute(p, prev_cpu, sync); |