lkml.org 
[lkml]   [2017]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 001/192] sched: Rename a misleading variable in build_overlap_sched_groups()
    3.16.49-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Zhihui Zhang <zzhsuny@gmail.com>

    commit aaecac4ad46b35ad308245384d019633fb9bc21b upstream.

    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 <zzhsuny@gmail.com>
    Signed-off-by: Peter 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.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    kernel/sched/core.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    --- a/kernel/sched/core.c
    +++ b/kernel/sched/core.c
    @@ -5808,7 +5808,7 @@ build_overlap_sched_groups(struct sched_
    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);
    @@ -5819,10 +5819,10 @@ build_overlap_sched_groups(struct sched_
    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(),
    @@ -5832,10 +5832,9 @@ build_overlap_sched_groups(struct sched_
    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);
    \
     
     \ /
      Last update: 2017-10-09 15:58    [W:2.633 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site