[tip:sched/core] sched: Assume *balance is valid

From: tip-bot for Peter Zijlstra
Date: Thu Jan 21 2010 - 08:54:56 EST


Commit-ID: 8f190fb3f7a405682666d3723f6ec370b5afe4da
Gitweb: http://git.kernel.org/tip/8f190fb3f7a405682666d3723f6ec370b5afe4da
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
AuthorDate: Thu, 24 Dec 2009 14:18:21 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 21 Jan 2010 13:40:15 +0100

sched: Assume *balance is valid

Since all load_balance() callers will have !NULL balance parameters we
can now assume so and remove a few checks.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
kernel/sched_fair.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index de5ab12..0b482f5 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -2465,7 +2465,7 @@ static inline void update_sg_lb_stats(struct sched_domain *sd,
* to do the newly idle load balance.
*/
if (idle != CPU_NEWLY_IDLE && local_group &&
- balance_cpu != this_cpu && balance) {
+ balance_cpu != this_cpu) {
*balance = 0;
return;
}
@@ -2528,7 +2528,7 @@ static inline void update_sd_lb_stats(struct sched_domain *sd, int this_cpu,
update_sg_lb_stats(sd, group, this_cpu, idle, load_idx, sd_idle,
local_group, cpus, balance, &sgs);

- if (local_group && balance && !(*balance))
+ if (local_group && !(*balance))
return;

sds->total_load += sgs.group_load;
@@ -2720,7 +2720,7 @@ find_busiest_group(struct sched_domain *sd, int this_cpu,
* 5) The imbalance is within the specified limit.
* 6) Any rebalance would lead to ping-pong
*/
- if (balance && !(*balance))
+ if (!(*balance))
goto ret;

if (!sds.busiest || sds.busiest_nr_running == 0)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/