lkml.org 
[lkml]   [2020]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 06/11] powerpc/smp: Stop passing mask to update_mask_by_l2
    Date
    update_mask_by_l2 is called only once. But it passes cpu_l2_cache_mask
    as parameter. Instead of passing cpu_l2_cache_mask, use it directly in
    update_mask_by_l2.

    Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
    Cc: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
    Cc: LKML <linux-kernel@vger.kernel.org>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: Nicholas Piggin <npiggin@gmail.com>
    Cc: Anton Blanchard <anton@ozlabs.org>
    Cc: Oliver O'Halloran <oohall@gmail.com>
    Cc: Nathan Lynch <nathanl@linux.ibm.com>
    Cc: Michael Neuling <mikey@neuling.org>
    Cc: Gautham R Shenoy <ego@linux.vnet.ibm.com>
    Cc: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Valentin Schneider <valentin.schneider@arm.com>
    Cc: Qian Cai <cai@redhat.com>
    ---
    arch/powerpc/kernel/smp.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
    index c860c4950c9f..441c9c64b1e3 100644
    --- a/arch/powerpc/kernel/smp.c
    +++ b/arch/powerpc/kernel/smp.c
    @@ -1218,7 +1218,7 @@ static struct device_node *cpu_to_l2cache(int cpu)
    return cache;
    }

    -static bool update_mask_by_l2(int cpu, struct cpumask *(*mask_fn)(int))
    +static bool update_mask_by_l2(int cpu)
    {
    struct device_node *l2_cache, *np;
    int i;
    @@ -1240,7 +1240,7 @@ static bool update_mask_by_l2(int cpu, struct cpumask *(*mask_fn)(int))
    return false;
    }

    - cpumask_set_cpu(cpu, mask_fn(cpu));
    + cpumask_set_cpu(cpu, cpu_l2_cache_mask(cpu));
    for_each_cpu_and(i, cpu_online_mask, cpu_cpu_mask(cpu)) {
    /*
    * when updating the marks the current CPU has not been marked
    @@ -1251,7 +1251,7 @@ static bool update_mask_by_l2(int cpu, struct cpumask *(*mask_fn)(int))
    continue;

    if (np == l2_cache)
    - set_cpus_related(cpu, i, mask_fn);
    + set_cpus_related(cpu, i, cpu_l2_cache_mask);

    of_node_put(np);
    }
    @@ -1315,7 +1315,7 @@ static void add_cpu_to_masks(int cpu)
    set_cpus_related(i, cpu, cpu_sibling_mask);

    add_cpu_to_smallcore_masks(cpu);
    - update_mask_by_l2(cpu, cpu_l2_cache_mask);
    + update_mask_by_l2(cpu);

    if (has_coregroup_support()) {
    int coregroup_id = cpu_to_coregroup_id(cpu);
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-10-07 20:50    [W:7.637 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site