diff --git a/[refs] b/[refs] index b51c72157724..8867dab75a53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db935dbd43c4290d710304662cc908f733afea06 +refs/heads/master: 99b61ccf0bf0e9a85823d39a5db6a1519caeb13d diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 8b035a8b3c30..f665de34ed82 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1877,15 +1877,9 @@ find_busiest_group(struct sched_domain *sd, int this_cpu, /* Get rid of the scaling factor, rounding down as we divide */ *imbalance = *imbalance / SCHED_LOAD_SCALE; - return busiest; out_balanced: - if (busiest && (idle == NEWLY_IDLE || - (idle == SCHED_IDLE && max_load > SCHED_LOAD_SCALE)) ) { - *imbalance = 1; - return busiest; - } *imbalance = 0; return NULL;