diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-25 11:42:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-25 11:42:00 +0100 |
| commit | 713c7153774c6b8b4cdc5bb13a0616e1f8ce7d0e (patch) | |
| tree | 9aaf0eae8597d2cb93b0e5ef90a6594ae1dd0aa4 | |
| parent | ca1c48eb89eb19eae1c6420454b20774f9ce48d7 (diff) | |
| parent | de29502181a1954f27eb774c4d22532d33fa3d04 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
| -rw-r--r-- | kernel/sched/fair.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 71da724449ee..483dee8eea78 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4483,7 +4483,11 @@ unlock: #else new_cpu = hmp_select_slower_cpu(p, prev_cpu); #endif - if (new_cpu != prev_cpu) { + /* + * we might have no suitable CPU + * in which case new_cpu == NR_CPUS + */ + if (new_cpu < NR_CPUS && new_cpu != prev_cpu) { hmp_next_down_delay(&p->se, new_cpu); trace_sched_hmp_migrate(p, new_cpu, HMP_MIGRATE_WAKEUP); return new_cpu; |