diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-09 02:45:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-09 02:45:19 -0700 |
| commit | 3d12c58f77e1c27ff937782dae8d21e37d80c5cb (patch) | |
| tree | 003923ee48879437fcdef029924f995f2156ea0d /kernel/sched/fair.c | |
| parent | 48b8215ed5dd682e65012cad439e2819a8a6e819 (diff) | |
| parent | a761ae85013944d6e007a343c7f24c342ae4dc18 (diff) | |
Merge "sched: Fix the bug in select_best_cpu() that returns -1 as target_cpu"
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 3b6038225c17..099a1b93bebf 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3240,7 +3240,8 @@ retry: sbc_flag |= SBC_FLAG_IDLE_LEAST_LOADED; } } else if (stats.best_cpu >= 0) { - if (stats.best_cpu != task_cpu(p) && + if (stats.best_sibling_cpu >= 0 && + stats.best_cpu != task_cpu(p) && stats.min_cost == stats.best_sibling_cpu_cost) { stats.best_cpu = stats.best_sibling_cpu; sbc_flag |= SBC_FLAG_BEST_SIBLING; |