From 4c7e183930f0eeebd6c4f778d01a87c6a890558a Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 27 Jun 2008 13:41:29 +0200 Subject: [PATCH] --- yaml --- r: 100231 b: refs/heads/master c: 42a3ac7d5cee89849448b41b86faeb86f98e92f6 h: refs/heads/master i: 100229: d54679aa9d64340883eed7b9e68d854697d9b475 100227: 95f1c33a841b3d4ccb28b1dc0cd5c7cc4a657340 100223: 9482a587ecb401a48d417fa3591505b2e12ffe7d v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 621ba700cf0d..27f23e9670d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 408ed066b11cf9ee4536573b4269ee3613bd735e +refs/heads/master: 42a3ac7d5cee89849448b41b86faeb86f98e92f6 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 865cb53a7ccf..734e4c556fcb 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1444,6 +1444,8 @@ load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest, list_for_each_entry(tg, &task_groups, list) { struct cfs_rq *busiest_cfs_rq = tg->cfs_rq[busiest_cpu]; + unsigned long busiest_h_load = busiest_cfs_rq->h_load; + unsigned long busiest_weight = busiest_cfs_rq->load.weight; long rem_load, moved_load; /* @@ -1452,8 +1454,8 @@ load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest, if (!busiest_cfs_rq->task_weight) continue; - rem_load = rem_load_move * busiest_cfs_rq->load.weight; - rem_load /= busiest_cfs_rq->h_load + 1; + rem_load = rem_load_move * busiest_weight; + rem_load /= busiest_h_load + 1; moved_load = __load_balance_fair(this_rq, this_cpu, busiest, rem_load, sd, idle, all_pinned, this_best_prio, @@ -1462,8 +1464,8 @@ load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest, if (!moved_load) continue; - moved_load *= busiest_cfs_rq->h_load; - moved_load /= busiest_cfs_rq->load.weight + 1; + moved_load *= busiest_h_load; + moved_load /= busiest_weight + 1; rem_load_move -= moved_load; if (rem_load_move < 0)