sched/fair: rename variable cpu_util eff_util
PATCH 1/1 sched/fair: rename variable cpu_util eff_util
cppcheck reportskernel/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
--- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/fair.c +3 -3
@@ -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);
Signature · 1 line
2.27.0
Quoted 8 lines · Tom Rix
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_utilSigned-off-by Tom Rix <[email protected]>
Quoted 26 lines · Tom Rix
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_utilSigned-off-by Tom Rix <[email protected]>--- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)kernel/sched/fair.c +1
-1@@ -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
kernel/sched/fair.c eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus, · line 7449
Quoted 10 lines
kernel/sched/fair.c +2
-2@@ -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().
[tip: sched/core] sched/fair: Rename variable cpu_util eff_util
In reply to Tom RixThe following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 24cce6bc14759bbddd8d2252d733212e1911b977 Gitweb: https://git.kernel.org/tip/24cce6bc14759bbddd8d2252d733212e1911b977 Author: Tom Rix <[email protected]> AuthorDate: Sun, 11 Jun 2023 08:25:35 -04:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 15 Jun 2023 13:28:20 +02:00
sched/fair: Rename variable cpu_util eff_util
cppcheck reportskernel/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
--- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/fair.c +3 -3
@@ -7463,7 +7463,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
@@ -7472,8 +7472,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);
[tip: sched/core] sched/fair: Rename variable cpu_util eff_util
In reply to Tom RixThe following commit has been merged into the sched/core branch of tip:
The following commit has been merged into the sched/core branch of tip:
Commit-ID: a707df30c9438a9d4d0a43ae7f22b59b078f94c4 Gitweb: https://git.kernel.org/tip/a707df30c9438a9d4d0a43ae7f22b59b078f94c4 Author: Tom Rix <[email protected]> AuthorDate: Sun, 11 Jun 2023 08:25:35 -04:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 16 Jun 2023 17:08:01 +02:00
sched/fair: Rename variable cpu_util eff_util
cppcheck reportskernel/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
--- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/fair.c +3 -3
@@ -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);