summaryrefslogtreecommitdiff
path: root/kernel/sched/core.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-01-30 18:28:36 (GMT)
committerIngo Molnar <mingo@kernel.org>2015-01-30 18:28:36 (GMT)
commit3847b272248a3a4ed70d20392cc0454917f7713b (patch)
tree2df5f60ebf35b128bbe7509a878829236c6cfcab /kernel/sched/core.c
parent5a5375977b721503e4d6b37ab8982902cd2d10b3 (diff)
parentbb2bc55a694d45cdeda91b6f28ab2adec28125ef (diff)
downloadlinux-3847b272248a3a4ed70d20392cc0454917f7713b.tar.xz
Merge branch 'sched/urgent' into sched/core
Merge all pending fixes and refresh the tree, before applying new changes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r--kernel/sched/core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b53cc85..0b591fe 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4650,6 +4650,9 @@ int cpuset_cpumask_can_shrink(const struct cpumask *cur,
struct dl_bw *cur_dl_b;
unsigned long flags;
+ if (!cpumask_weight(cur))
+ return ret;
+
rcu_read_lock_sched();
cur_dl_b = dl_bw_of(cpumask_any(cur));
trial_cpus = cpumask_weight(trial);