sched: Move code around
Commit-ID: f5f08f39ee4c5fd0a757d25d9e04d696676b3df7 Gitweb: http://git.kernel.org/tip/f5f08f39ee4c5fd0a757d25d9e04d696676b3df7 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 10 Sep 2009 13:35:28 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 15 Sep 2009 16:01:03 +0200
sched: Move code around
In preparation to other code movement, move weighted_cpuload(), source_load() and target_load() before the class includes.
Signed-off-by Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/sched.c | 81 +++++++++++++++++++++++++++----------------------------- 1 files changed, 39 insertions(+), 42 deletions(-)
kernel/sched.c +39 -42
@@ -1507,8 +1507,45 @@ static int tg_nop(struct task_group *tg, void *data)#endif #ifdef CONFIG_SMP -static unsigned long source_load (int cpu,int type); -static unsigned long target_load (int cpu,int type); +/* Used instead of source_load when we know the type == 0 */ +static unsigned long weighted_cpuload (const int cpu) +{ +return cpu_rq (cpu)->load.weight; +} + +/* +* Return a low guess at the load of a migration-source cpu weighted +* according to the scheduling class and "nice" value. +* +* We want to under-estimate the load of migration sources, to +* balance conservatively. +*/ +static unsigned long source_load (int cpu,int type) +{ +struct rq *rq =cpu_rq (cpu); +unsigned long total =weighted_cpuload (cpu); + +if (type ==0 || !sched_feat (LB_BIAS )) +return total; + +return min (rq->cpu_load[type-1 ], total); +} + +/* +* Return a high guess at the load of a migration-target cpu weighted +* according to the scheduling class and "nice" value. +*/ +static unsigned long target_load (int cpu,int type) +{ +struct rq *rq =cpu_rq (cpu); +unsigned long total =weighted_cpuload (cpu); + +if (type ==0 || !sched_feat (LB_BIAS )) +return total; + +return max (rq->cpu_load[type-1 ], total); +} +static int task_hot (struct task_struct *p,u64 now,struct sched_domain *sd);static unsigned long cpu_avg_load_per_task (int cpu)
@@ -1959,13 +1996,6 @@ static inline void check_class_changed(struct rq *rq, struct task_struct *p, }#ifdef CONFIG_SMP - -/* Used instead of source_load when we know the type == 0 */ -static unsigned long weighted_cpuload (const int cpu) -{ -return cpu_rq (cpu)->load.weight; -} -/* * Is this task likely cache-hot: */
@@ -2241,39 +2271,6 @@ void kick_process(struct task_struct *p)EXPORT_SYMBOL_GPL (kick_process);/* -* Return a low guess at the load of a migration-source cpu weighted -* according to the scheduling class and "nice" value. -* -* We want to under-estimate the load of migration sources, to -* balance conservatively. -*/ -static unsigned long source_load (int cpu,int type) -{ -struct rq *rq =cpu_rq (cpu); -unsigned long total =weighted_cpuload (cpu); - -if (type ==0 || !sched_feat (LB_BIAS )) -return total; - -return min (rq->cpu_load[type-1 ], total); -} - -/* -* Return a high guess at the load of a migration-target cpu weighted -* according to the scheduling class and "nice" value. -*/ -static unsigned long target_load (int cpu,int type) -{ -struct rq *rq =cpu_rq (cpu); -unsigned long total =weighted_cpuload (cpu); - -if (type ==0 || !sched_feat (LB_BIAS )) -return total; - -return max (rq->cpu_load[type-1 ], total); -} - -/* * find_idlest_group finds and returns the least busy CPU group within the * domain. */