2020-07-28 09:06:18

by 王文虎

Subject: [PATCH] sched: loadavg: delete useless param ticks for calc_global_load

The only parameter "unsigned long ticks" for calc_global_load is
never used inside the function definition. Delete it now.

Signed-off-by: Wang Wenhu <[email protected]>
---
include/linux/sched/loadavg.h | 2 +-
kernel/sched/loadavg.c | 2 +-
kernel/time/timekeeping.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/sched/loadavg.h b/include/linux/sched/loadavg.h
index 4859bea47a7b..83ec54b65e79 100644
--- a/include/linux/sched/loadavg.h
+++ b/include/linux/sched/loadavg.h
@@ -43,6 +43,6 @@ extern unsigned long calc_load_n(unsigned long load, unsigned long exp,
#define LOAD_INT(x) ((x) >> FSHIFT)
#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)

-extern void calc_global_load(unsigned long ticks);
+extern void calc_global_load(void);

#endif /* _LINUX_SCHED_LOADAVG_H */
diff --git a/kernel/sched/loadavg.c b/kernel/sched/loadavg.c
index de22da666ac7..d2a655643a02 100644
--- a/kernel/sched/loadavg.c
+++ b/kernel/sched/loadavg.c
@@ -347,7 +347,7 @@ static inline void calc_global_nohz(void) { }
*
* Called from the global timer code.
*/
-void calc_global_load(unsigned long ticks)
+void calc_global_load(void)
{
unsigned long sample_window;
long active, delta;
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index d20d489841c8..63a632f9896c 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -2193,7 +2193,7 @@ EXPORT_SYMBOL(ktime_get_coarse_ts64);
void do_timer(unsigned long ticks)
{
jiffies_64 += ticks;
- calc_global_load(ticks);
+ calc_global_load();
}

/**
--
2.17.1

2020-07-28 09:30:53

by Dietmar Eggemann

Subject: Re: [PATCH] sched: loadavg: delete useless param ticks for calc_global_load

On 28/07/2020 10:58, Wang Wenhu wrote:
> The only parameter "unsigned long ticks" for calc_global_load is
> never used inside the function definition. Delete it now.
>
> Signed-off-by: Wang Wenhu <[email protected]>
> ---
> include/linux/sched/loadavg.h | 2 +-
> kernel/sched/loadavg.c | 2 +-
> kernel/time/timekeeping.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/sched/loadavg.h b/include/linux/sched/loadavg.h
> index 4859bea47a7b..83ec54b65e79 100644
> --- a/include/linux/sched/loadavg.h
> +++ b/include/linux/sched/loadavg.h
> @@ -43,6 +43,6 @@ extern unsigned long calc_load_n(unsigned long load, unsigned long exp,
> #define LOAD_INT(x) ((x) >> FSHIFT)
> #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
>
> -extern void calc_global_load(unsigned long ticks);
> +extern void calc_global_load(void);
>
> #endif /* _LINUX_SCHED_LOADAVG_H */
> diff --git a/kernel/sched/loadavg.c b/kernel/sched/loadavg.c
> index de22da666ac7..d2a655643a02 100644
> --- a/kernel/sched/loadavg.c
> +++ b/kernel/sched/loadavg.c
> @@ -347,7 +347,7 @@ static inline void calc_global_nohz(void) { }
> *
> * Called from the global timer code.
> */
> -void calc_global_load(unsigned long ticks)
> +void calc_global_load(void)
> {
> unsigned long sample_window;
> long active, delta;
> diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
> index d20d489841c8..63a632f9896c 100644
> --- a/kernel/time/timekeeping.c
> +++ b/kernel/time/timekeeping.c
> @@ -2193,7 +2193,7 @@ EXPORT_SYMBOL(ktime_get_coarse_ts64);
> void do_timer(unsigned long ticks)
> {
> jiffies_64 += ticks;
> - calc_global_load(ticks);
> + calc_global_load();
> }
>
> /**

There is already commit 46132e3ac58c ("sched: nohz: stop passing around
unused "ticks" parameter.") in linux-next master.