diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched_fair.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 0b482f5b5b3b..22231ccb2f98 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -2418,11 +2418,8 @@ static inline void update_sg_lb_stats(struct sched_domain *sd, | |||
2418 | unsigned long sum_avg_load_per_task; | 2418 | unsigned long sum_avg_load_per_task; |
2419 | unsigned long avg_load_per_task; | 2419 | unsigned long avg_load_per_task; |
2420 | 2420 | ||
2421 | if (local_group) { | 2421 | if (local_group) |
2422 | balance_cpu = group_first_cpu(group); | 2422 | balance_cpu = group_first_cpu(group); |
2423 | if (balance_cpu == this_cpu) | ||
2424 | update_group_power(sd, this_cpu); | ||
2425 | } | ||
2426 | 2423 | ||
2427 | /* Tally up the load of all CPUs in the group */ | 2424 | /* Tally up the load of all CPUs in the group */ |
2428 | sum_avg_load_per_task = avg_load_per_task = 0; | 2425 | sum_avg_load_per_task = avg_load_per_task = 0; |
@@ -2470,6 +2467,8 @@ static inline void update_sg_lb_stats(struct sched_domain *sd, | |||
2470 | return; | 2467 | return; |
2471 | } | 2468 | } |
2472 | 2469 | ||
2470 | update_group_power(sd, this_cpu); | ||
2471 | |||
2473 | /* Adjust by relative CPU power of the group */ | 2472 | /* Adjust by relative CPU power of the group */ |
2474 | sgs->avg_load = (sgs->group_load * SCHED_LOAD_SCALE) / group->cpu_power; | 2473 | sgs->avg_load = (sgs->group_load * SCHED_LOAD_SCALE) / group->cpu_power; |
2475 | 2474 | ||