Commit d91cecc1 authored by Chen Yu's avatar Chen Yu Committed by Peter Zijlstra
Browse files

sched: Make newidle_balance() static again 



After Commit 6e2df058 ("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: default avatarkbuild test robot <lkp@intel.com>
Suggested-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarChen Yu <yu.c.chen@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/83cd3030b031ca5d646cd5e225be10e7a0fdd8f5.1587464698.git.yu.c.chen@intel.com
parent 36c5bdc4

kernel/sched/fair.c

+4 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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;

}
@@ -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;

kernel/sched/sched.h

+0 −4
Original line number Diff line number Diff line
@@ -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"

CRA Git | Maintained and supported by SUSTech CRA and CCSE