qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arch/topology: Fix variable naming to avoid shadowing 

JIRA: https://issues.redhat.com/browse/RHEL-56494

commit e5bc44e47c531860be96ac615314b1ab23d5aa2b
Author: Vincent Guittot <vincent.guittot@linaro.org>
Date:   Thu Apr 25 09:37:09 2024 +0200

    arch/topology: Fix variable naming to avoid shadowing

    Using 'hw_pressure' for local variable name is confusing in regard to the
    per-CPU 'hw_pressure' variable that uses the same name:

      include/linux/arch_topology.h:DECLARE_PER_CPU(unsigned long, hw_pressure);

    ... which puts it into a global scope for all code that includes
    <linux/topology.h>, shadowing the local variable.

    Rename it to avoid compiler confusion & Sparse warnings.

    [ mingo: Expanded the changelog. ]

    Reported-by: kernel test robot <lkp@intel.com>
    Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
    Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
    Acked-by: Sudeep Holla <sudeep.holla@arm.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Link: https://lore.kernel.org/r/20240425073709.379016-1-vincent.guittot@linaro.org
    Closes: https://lore.kernel.org/oe-kbuild-all/202404250740.VhQQoD7N-lkp@intel.com/
    Fixes: d4dbc991714e ("sched/cpufreq: Rename arch_update_thermal_pressure() => arch_update_hw_pressure()")
    Tested-by: Konrad Dybcio <konrad.dybcio@linaro.org> # QC SM8550 QRD

Signed-off-by: Phil Auld <pauld@redhat.com>
This commit is contained in:
Phil Auld 2024-09-11 14:52:04 -04:00
parent 14a470e760
commit 09e9282b84
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/base/arch_topology.c
View File

@ -179,7 +179,7 @@ DEFINE_PER_CPU(unsigned long, hw_pressure);
void topology_update_hw_pressure(const struct cpumask *cpus,
unsigned long capped_freq)
{
unsigned long max_capacity, capacity, hw_pressure;
unsigned long max_capacity, capacity, pressure;
u32 max_freq;
int cpu;
@ -196,12 +196,12 @@ void topology_update_hw_pressure(const struct cpumask *cpus,
else
capacity = mult_frac(max_capacity, capped_freq, max_freq);
hw_pressure = max_capacity - capacity;
pressure = max_capacity - capacity;
trace_hw_pressure_update(cpu, hw_pressure);
trace_hw_pressure_update(cpu, pressure);
for_each_cpu(cpu, cpus)
WRITE_ONCE(per_cpu(hw_pressure, cpu), hw_pressure);
WRITE_ONCE(per_cpu(hw_pressure, cpu), pressure);
}
EXPORT_SYMBOL_GPL(topology_update_hw_pressure);