Commit e5bc44e4 authored by Vincent Guittot's avatar Vincent Guittot Committed by Ingo Molnar
Browse files

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: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Acked-by: default avatarSudeep 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: d4dbc991 ("sched/cpufreq: Rename arch_update_thermal_pressure() => arch_update_hw_pressure()")
Tested-by: Konrad Dybcio <konrad.dybcio@linaro.org> # QC SM8550 QRD
parent 9776dd36

drivers/base/arch_topology.c

+4 −4
Original line number Diff line number Diff line
@@ -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);