Skip to content

Commit

Permalink
sched: Make newidle_balance() static again
Browse files Browse the repository at this point in the history
After Commit 6e2df05 ("sched: Fix pick_next_task() vs 'change'
pattern race"), there is no need to expose newidle_balance() as it
is only used within fair.c file. Change this function back to static again.

No functional change.

Reported-by: kbuild test robot <lkp@intel.com>
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/83cd3030b031ca5d646cd5e225be10e7a0fdd8f5.1587464698.git.yu.c.chen@intel.com
  • Loading branch information
Chen Yu authored and Peter Zijlstra committed Apr 30, 2020
1 parent 36c5bdc commit d91cecc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 4 additions & 2 deletions kernel/sched/fair.c
Original file line number Diff line number Diff line change
Expand Up @@ -3873,6 +3873,8 @@ static inline unsigned long cfs_rq_load_avg(struct cfs_rq *cfs_rq)
return cfs_rq->avg.load_avg;
}

static int newidle_balance(struct rq *this_rq, struct rq_flags *rf);

static inline unsigned long task_util(struct task_struct *p)
{
return READ_ONCE(p->se.avg.util_avg);
Expand Down Expand Up @@ -4054,7 +4056,7 @@ attach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}
static inline void
detach_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}

static inline int idle_balance(struct rq *rq, struct rq_flags *rf)
static inline int newidle_balance(struct rq *rq, struct rq_flags *rf)
{
return 0;
}
Expand Down Expand Up @@ -10414,7 +10416,7 @@ static inline void nohz_newidle_balance(struct rq *this_rq) { }
* 0 - failed, no new tasks
* > 0 - success, new (fair) tasks present
*/
int newidle_balance(struct rq *this_rq, struct rq_flags *rf)
static int newidle_balance(struct rq *this_rq, struct rq_flags *rf)
{
unsigned long next_balance = jiffies + HZ;
int this_cpu = this_rq->cpu;
Expand Down
4 changes: 0 additions & 4 deletions kernel/sched/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -1503,14 +1503,10 @@ static inline void unregister_sched_domain_sysctl(void)
}
#endif

extern int newidle_balance(struct rq *this_rq, struct rq_flags *rf);

#else

static inline void sched_ttwu_pending(void) { }

static inline int newidle_balance(struct rq *this_rq, struct rq_flags *rf) { return 0; }

#endif /* CONFIG_SMP */

#include "stats.h"
Expand Down

0 comments on commit d91cecc

Please sign in to comment.