aboutsummaryrefslogtreecommitdiff
path: root/kernel/sched/core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-22 12:33:23 +0000
committerMark Brown <broonie@linaro.org>2014-01-22 12:33:23 +0000
commit2305009118181260b45aab82f14bcbb659953ef1 (patch)
tree0c2c9469d7ae37f38449116971bf16b10355e19c /kernel/sched/core.c
parent0e9b1909c3c660060d94a0a8a15c5299de97a4aa (diff)
parentb30814c74c184bbb231e24d6c857699af338468b (diff)
downloadlinaro-lsk-v3.10/topic/big.LITTLE.tar.gz
Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into lsk-v3.10-big.LITTLEv3.10/topic/big.LITTLE
Conflicts: kernel/irq/irqdesc.c linaro/configs/big-LITTLE-MP.conf
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r--kernel/sched/core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index fb9b7b74a83..3e326f9208f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3842,8 +3842,11 @@ __setscheduler(struct rq *rq, struct task_struct *p, int policy, int prio)
p->sched_class = &rt_sched_class;
#ifdef CONFIG_SCHED_HMP
if (!cpumask_empty(&hmp_slow_cpu_mask))
- if (cpumask_equal(&p->cpus_allowed, cpu_all_mask))
+ if (cpumask_equal(&p->cpus_allowed, cpu_all_mask)) {
+ p->nr_cpus_allowed =
+ cpumask_weight(&hmp_slow_cpu_mask);
do_set_cpus_allowed(p, &hmp_slow_cpu_mask);
+ }
#endif
}
else