From d12e1fe8c1d59f63c0d85e20f04d228a069d7198 Mon Sep 17 00:00:00 2001
From: Gautham R Shenoy <ego@in.ibm.com>
Date: Sat, 6 Sep 2008 14:50:23 +0530
Subject: [PATCH] --- yaml --- r: 110711 b: refs/heads/master c:
 38736f475071b80b66be28af7b44c854073699cc h: refs/heads/master i:   110709:
 b5214cb04554b3d2af42b8381a812542741ffb66   110707:
 428dd8168b34c36c7812441ee954c89013d87d85   110703:
 54c4b1b6a03fcac3f220dee325ae9a1d1791e9e7 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched_fair.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;