diff --git a/[refs] b/[refs] index 883812a4bf73..461ee760d191 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f79d852ed30a06eebf7497afe9334a726db3d40 +refs/heads/master: 38736f475071b80b66be28af7b44c854073699cc diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 8264bb5dbd51..a10ac0bcee64 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1458,7 +1458,7 @@ __load_balance_iterator(struct cfs_rq *cfs_rq, struct list_head *next) next = next->next; } while (next != &cfs_rq->tasks && !entity_is_task(se)); - if (next == &cfs_rq->tasks) + if (next == &cfs_rq->tasks && !entity_is_task(se)) return NULL; cfs_rq->balance_iterator = next;