diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-30 19:28:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-30 19:28:36 +0100 |
| commit | 3847b272248a3a4ed70d20392cc0454917f7713b (patch) | |
| tree | 2df5f60ebf35b128bbe7509a878829236c6cfcab /kernel/sched | |
| parent | 5a5375977b721503e4d6b37ab8982902cd2d10b3 (diff) | |
| parent | bb2bc55a694d45cdeda91b6f28ab2adec28125ef (diff) | |
| download | lwn-3847b272248a3a4ed70d20392cc0454917f7713b.tar.gz lwn-3847b272248a3a4ed70d20392cc0454917f7713b.zip | |
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')
| -rw-r--r-- | kernel/sched/core.c | 3 | ||||
| -rw-r--r-- | kernel/sched/fair.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b53cc859fc4f..0b591fe67b70 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); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2ecf779829f5..7ce18f3c097a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1729,7 +1729,7 @@ static int preferred_group_nid(struct task_struct *p, int nid) nodes = node_online_map; for (dist = sched_max_numa_distance; dist > LOCAL_DISTANCE; dist--) { unsigned long max_faults = 0; - nodemask_t max_group; + nodemask_t max_group = NODE_MASK_NONE; int a, b; /* Are there nodes at this distance from each other? */ |