diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-09-05 18:17:48 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-09-05 18:17:48 +0100 |
| commit | 7ac3860c98608e2f9782902b4439e0ade53c2364 (patch) | |
| tree | e810a1a47150bff31ca7057a1d0ecf9344b4c066 | |
| parent | 18e3c3d2cc1346cb7cc2e3fd777b2c6f4fbb6135 (diff) | |
| parent | c2111520cfc682629fd75d0741ffee78b3b940ab (diff) | |
Merge tag 'big-LITTLE-MP-13.08' into for-lsk
This merge is intended to tidyup the history of the big.LITTLE MP
patchset to enable ongoing maintenance of a standalone MP branch.
The only code change introduce by this merge is to add commit
0d5ddd14 (HMP: select 'best' task for migration rather than 'current')
This change is already in the Linaro Stable Kernel as commit
c5021c1eb9c73f38209180c65bd074ac70c97587
| -rw-r--r-- | kernel/sched/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 50d9e9849ce..fb9b7b74a83 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3841,8 +3841,9 @@ __setscheduler(struct rq *rq, struct task_struct *p, int policy, int prio) if (rt_prio(p->prio)) { p->sched_class = &rt_sched_class; #ifdef CONFIG_SCHED_HMP - if (cpumask_equal(&p->cpus_allowed, cpu_all_mask)) - do_set_cpus_allowed(p, &hmp_slow_cpu_mask); + if (!cpumask_empty(&hmp_slow_cpu_mask)) + if (cpumask_equal(&p->cpus_allowed, cpu_all_mask)) + do_set_cpus_allowed(p, &hmp_slow_cpu_mask); #endif } else |