diff options
| author | Vincent Guittot <vincent.guittot@linaro.org> | 2013-05-30 17:54:42 +0200 |
|---|---|---|
| committer | Vincent Guittot <vincent.guittot@linaro.org> | 2013-10-17 22:10:59 +0200 |
| commit | fb35cd579c403a28c08b819a2b9989e0c6c4c2db (patch) | |
| tree | 9b55dcb6373c09acb72cfc129006fc367c4a832c | |
| parent | 2c68cccac47f1371d103944f66c683166af3fb59 (diff) | |
sched: move load idx selection in find_idlest_group
load_idx is used in find_idlest_group but initialized in select_task_rq_fair
even when not used. The load_idx initialisation is moved in find_idlest_group
and the sd_flag replaces it in the function's args.
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
| -rw-r--r-- | kernel/sched/fair.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 7e26f6569e15..c258c382339a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3430,12 +3430,16 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync) */ static struct sched_group * find_idlest_group(struct sched_domain *sd, struct task_struct *p, - int this_cpu, int load_idx) + int this_cpu, int sd_flag) { struct sched_group *idlest = NULL, *group = sd->groups; unsigned long min_load = ULONG_MAX, this_load = 0; + int load_idx = sd->forkexec_idx; int imbalance = 100 + (sd->imbalance_pct-100)/2; + if (sd_flag & SD_BALANCE_WAKE) + load_idx = sd->wake_idx; + do { unsigned long load, avg_load; int local_group, packing_cpus = 0; @@ -3632,7 +3636,6 @@ select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flags) } while (sd) { - int load_idx = sd->forkexec_idx; struct sched_group *group; int weight; @@ -3641,10 +3644,7 @@ select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flags) continue; } - if (sd_flag & SD_BALANCE_WAKE) - load_idx = sd->wake_idx; - - group = find_idlest_group(sd, p, cpu, load_idx); + group = find_idlest_group(sd, p, cpu, sd_flag); if (!group) { sd = sd->child; continue; |