diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-30 07:05:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-30 07:05:23 -0800 |
| commit | 3ed889b39e25a18b2809cc6d559b3ea2fc1ef952 (patch) | |
| tree | 7726a95998dd7966d1de5adf68eb63e90f9c2d6c /kernel | |
| parent | 564fc4f080ed5b3f4c5ce1555e92f91a0f56a61a (diff) | |
| parent | 827a31c699abf2346b472da214280c983783f34b (diff) | |
Merge "sched: set LBF_IGNORE_PREFERRED_CLUSTER_TASKS correctly"
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/fair.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index c52655581c4c..ac4c3f1d144a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7940,10 +7940,11 @@ static int detach_tasks(struct lb_env *env) if (env->imbalance <= 0) return 0; + if (!same_cluster(env->dst_cpu, env->src_cpu)) + env->flags |= LBF_IGNORE_PREFERRED_CLUSTER_TASKS; + if (cpu_capacity(env->dst_cpu) < cpu_capacity(env->src_cpu)) env->flags |= LBF_IGNORE_BIG_TASKS; - else if (!same_cluster(env->dst_cpu, env->src_cpu)) - env->flags |= LBF_IGNORE_PREFERRED_CLUSTER_TASKS; redo: while (!list_empty(tasks)) { |