openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/smp: Stop passing mask to update_mask_by_l2 

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>
Tested-by: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200921095653.9701-7-srikar@linux.vnet.ibm.com
This commit is contained in:
Srikar Dronamraju 2020-09-21 15:26:48 +05:30 committed by Michael Ellerman
parent 53516d4aba
commit 1f3a418104
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/kernel/smp.c
View File

@ -1218,7 +1218,7 @@ static struct device_node *cpu_to_l2cache(int cpu)
return cache; 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; struct device_node *l2_cache, *np;
int i; int i;
@ -1240,7 +1240,7 @@ static bool update_mask_by_l2(int cpu, struct cpumask *(*mask_fn)(int))
return false; 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)) { for_each_cpu_and(i, cpu_online_mask, cpu_cpu_mask(cpu)) {
/* /*
* when updating the marks the current CPU has not been marked * 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; continue;
if (np == l2_cache) if (np == l2_cache)
set_cpus_related(cpu, i, mask_fn); set_cpus_related(cpu, i, cpu_l2_cache_mask);
of_node_put(np); of_node_put(np);
} }
@ -1315,7 +1315,7 @@ static void add_cpu_to_masks(int cpu)
set_cpus_related(i, cpu, cpu_sibling_mask); set_cpus_related(i, cpu, cpu_sibling_mask);
add_cpu_to_smallcore_masks(cpu); add_cpu_to_smallcore_masks(cpu);
update_mask_by_l2(cpu, cpu_l2_cache_mask); update_mask_by_l2(cpu);
if (has_coregroup_support()) { if (has_coregroup_support()) {
int coregroup_id = cpu_to_coregroup_id(cpu); int coregroup_id = cpu_to_coregroup_id(cpu);