Commit aaecac4a authored by Zhihui Zhang's avatar Zhihui Zhang Committed by Ingo Molnar

sched: Rename a misleading variable in build_overlap_sched_groups()

The child variable in build_overlap_sched_groups() actually refers to the
peer or sibling domain of the given CPU. Rename it to sibling to be consistent
with the naming in build_group_mask().
Signed-off-by: default avatarZhihui Zhang <zzhsuny@gmail.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1406942283-18249-1-git-send-email-zzhsuny@gmail.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9a5d9ba6
...@@ -5739,7 +5739,7 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu) ...@@ -5739,7 +5739,7 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu)
const struct cpumask *span = sched_domain_span(sd); const struct cpumask *span = sched_domain_span(sd);
struct cpumask *covered = sched_domains_tmpmask; struct cpumask *covered = sched_domains_tmpmask;
struct sd_data *sdd = sd->private; struct sd_data *sdd = sd->private;
struct sched_domain *child; struct sched_domain *sibling;
int i; int i;
cpumask_clear(covered); cpumask_clear(covered);
...@@ -5750,10 +5750,10 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu) ...@@ -5750,10 +5750,10 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu)
if (cpumask_test_cpu(i, covered)) if (cpumask_test_cpu(i, covered))
continue; continue;
child = *per_cpu_ptr(sdd->sd, i); sibling = *per_cpu_ptr(sdd->sd, i);
/* See the comment near build_group_mask(). */ /* See the comment near build_group_mask(). */
if (!cpumask_test_cpu(i, sched_domain_span(child))) if (!cpumask_test_cpu(i, sched_domain_span(sibling)))
continue; continue;
sg = kzalloc_node(sizeof(struct sched_group) + cpumask_size(), sg = kzalloc_node(sizeof(struct sched_group) + cpumask_size(),
...@@ -5763,10 +5763,9 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu) ...@@ -5763,10 +5763,9 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu)
goto fail; goto fail;
sg_span = sched_group_cpus(sg); sg_span = sched_group_cpus(sg);
if (child->child) { if (sibling->child)
child = child->child; cpumask_copy(sg_span, sched_domain_span(sibling->child));
cpumask_copy(sg_span, sched_domain_span(child)); else
} else
cpumask_set_cpu(i, sg_span); cpumask_set_cpu(i, sg_span);
cpumask_or(covered, covered, sg_span); cpumask_or(covered, covered, sg_span);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment