Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61769
b: refs/heads/master
c: 9439aab
h: refs/heads/master
i:
  61767: ce25915
v: v3
  • Loading branch information
Suresh Siddha authored and Ingo Molnar committed Jul 19, 2007
1 parent b52ed09 commit c9d320c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c41917df8a1adde34864116ce2231a7fe308d2ff
refs/heads/master: 9439aab8dbc33c2c03c3a19dba267360383ba38c
8 changes: 5 additions & 3 deletions trunk/kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -2235,7 +2235,7 @@ find_busiest_group(struct sched_domain *sd, int this_cpu,

rq = cpu_rq(i);

if (*sd_idle && !idle_cpu(i))
if (*sd_idle && rq->nr_running)
*sd_idle = 0;

/* Bias balancing toward cpus of our domain */
Expand All @@ -2257,9 +2257,11 @@ find_busiest_group(struct sched_domain *sd, int this_cpu,
/*
* First idle cpu or the first cpu(busiest) in this sched group
* is eligible for doing load balancing at this and above
* domains.
* domains. In the newly idle case, we will allow all the cpu's
* to do the newly idle load balance.
*/
if (local_group && balance_cpu != this_cpu && balance) {
if (idle != CPU_NEWLY_IDLE && local_group &&
balance_cpu != this_cpu && balance) {
*balance = 0;
goto ret;
}
Expand Down

0 comments on commit c9d320c

Please sign in to comment.