Re: [PATCH] sched/fair: rename variable cpu_util eff_util

[Dietmar Eggemann <dietmar.eggemann@arm.com>]

On 11/06/2023 14:25, Tom Rix wrote:
> cppcheck reports
> kernel/sched/fair.c:7436:17: style: Local variable 'cpu_util' shadows outer function [shadowFunction]
>   unsigned long cpu_util;
>                 ^
> 
> Clean this up by renaming the variable to eff_util
> 
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>  kernel/sched/fair.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> index 6189d1a45635..7666dbc2b788 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -7433,7 +7433,7 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,
>  	for_each_cpu(cpu, pd_cpus) {
>  		struct task_struct *tsk = (cpu == dst_cpu) ? p : NULL;
>  		unsigned long util = cpu_util(cpu, p, dst_cpu, 1);
> -		unsigned long cpu_util;
> +		unsigned long eff_util;
>  
>  		/*
>  		 * Performance domain frequency: utilization clamping
> @@ -7442,8 +7442,8 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,
>  		 * NOTE: in case RT tasks are running, by default the
>  		 * FREQUENCY_UTIL's utilization can be max OPP.
>  		 */
> -		cpu_util = effective_cpu_util(cpu, util, FREQUENCY_UTIL, tsk);
> -		max_util = max(max_util, cpu_util);
> +		eff_util = effective_cpu_util(cpu, util, FREQUENCY_UTIL, tsk);
> +		max_util = max(max_util, eff_util);
>  	}
>  
>  	return min(max_util, eenv->cpu_cap);

I forgot to check this in patch 'sched/fair: Refactor CPU utilization
functions' when I replaced cpu_util_next() with cpu_util().

Reviewed-by: Dietmar Eggemann <dietmar.eggemann@arm.com>