Skip to content

Commit 46132e3

Browse files
Paul GortmakerPeter Zijlstra
authored andcommitted
sched: nohz: stop passing around unused "ticks" parameter.
The "ticks" parameter was added in commit 0f004f5 ("sched: Cure more NO_HZ load average woes") since calc_global_nohz() was called and needed the "ticks" argument. But in commit c308b56 ("sched: Fix nohz load accounting -- again!") it became unused as the function calc_global_nohz() dropped using "ticks". Fixes: c308b56 ("sched: Fix nohz load accounting -- again!") Signed-off-by: Paul Gortmaker <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 58877d3 commit 46132e3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

include/linux/sched/loadavg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ extern unsigned long calc_load_n(unsigned long load, unsigned long exp,
4343
#define LOAD_INT(x) ((x) >> FSHIFT)
4444
#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
4545

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

4848
#endif /* _LINUX_SCHED_LOADAVG_H */

kernel/sched/loadavg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ static inline void calc_global_nohz(void) { }
347347
*
348348
* Called from the global timer code.
349349
*/
350-
void calc_global_load(unsigned long ticks)
350+
void calc_global_load(void)
351351
{
352352
unsigned long sample_window;
353353
long active, delta;

kernel/time/timekeeping.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2193,7 +2193,7 @@ EXPORT_SYMBOL(ktime_get_coarse_ts64);
21932193
void do_timer(unsigned long ticks)
21942194
{
21952195
jiffies_64 += ticks;
2196-
calc_global_load(ticks);
2196+
calc_global_load();
21972197
}
21982198

21992199
/**

0 commit comments

Comments
 (0)