Rename a misleading variable in build_overlap_sched_groups()
PATCH 1/1 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 Zhihui Zhang <[email protected]>
--- kernel/sched/core.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
kernel/sched/core.c +6 -7
@@ -5720,7 +5720,7 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu)const struct cpumask *span =sched_domain_span (sd);struct cpumask *covered = sched_domains_tmpmask;struct sd_data *sdd = sd->private; -struct sched_domain *child; +struct sched_domain *sibling;int i;cpumask_clear (covered);
@@ -5731,10 +5731,10 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu)if (cpumask_test_cpu (i, covered))continue ; - child = *per_cpu_ptr (sdd->sd, i); + sibling = *per_cpu_ptr (sdd->sd, i);/* 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 ; sg = kzalloc_node(sizeof(struct sched_group) + cpumask_size(),
@@ -5744,10 +5744,9 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu) goto fail; sg_span =sched_group_cpus (sg); -if (child->child) { - child = child->child; -cpumask_copy (sg_span,sched_domain_span (child)); - }else +if (sibling->child) +cpumask_copy (sg_span,sched_domain_span (sibling->child)); +else cpumask_set_cpu (i, sg_span);cpumask_or (covered, covered, sg_span);
Signature · 1 line
1.8.1.2
tip-bot for Zhihui Zhang
merge bot[tip:sched/core] sched: Rename a misleading variable in build_overlap_sched_groups()
sched: Rename a misleading variable in build_overlap_sched_groups()
Commit-ID: aaecac4ad46b35ad308245384d019633fb9bc21b Gitweb: http://git.kernel.org/tip/aaecac4ad46b35ad308245384d019633fb9bc21b Author: Zhihui Zhang <[email protected]> AuthorDate: Fri, 1 Aug 2014 21:18:03 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 12 Aug 2014 12:48:21 +0200
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 Zhihui Zhang <[email protected]>
Signed-off-by Peter Zijlstra <[email protected]>
Cc Linus Torvalds <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/sched/core.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
kernel/sched/core.c +6 -7
@@ -5739,7 +5739,7 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu)const struct cpumask *span =sched_domain_span (sd);struct cpumask *covered = sched_domains_tmpmask;struct sd_data *sdd = sd->private; -struct sched_domain *child; +struct sched_domain *sibling;int i;cpumask_clear (covered);
@@ -5750,10 +5750,10 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu)if (cpumask_test_cpu (i, covered))continue ; - child = *per_cpu_ptr (sdd->sd, i); + sibling = *per_cpu_ptr (sdd->sd, i);/* 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 ; sg = kzalloc_node(sizeof(struct sched_group) + cpumask_size(),
@@ -5763,10 +5763,9 @@ build_overlap_sched_groups(struct sched_domain *sd, int cpu) goto fail; sg_span =sched_group_cpus (sg); -if (child->child) { - child = child->child; -cpumask_copy (sg_span,sched_domain_span (child)); - }else +if (sibling->child) +cpumask_copy (sg_span,sched_domain_span (sibling->child)); +else cpumask_set_cpu (i, sg_span);cpumask_or (covered, covered, sg_span);