From e49d5d43c63500e2dfe4546b36e6715291701e26 Mon Sep 17 00:00:00 2001
From: Paul Turner <pjt@google.com>
Date: Wed, 6 Jul 2011 22:30:37 -0700
Subject: [PATCH] --- yaml --- r: 257171 b: refs/heads/master c:
 9598c82dcacadc3b9daa8170613fd054c6124d30 h: refs/heads/master i:   257169:
 c253f9118c4054f71883ad9fc5b089100ce5547b   257167:
 01721b9fc079962533809be174ce650befe1724d v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched_fair.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 53cba3ec8a3c..4197785ae8b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bbd7374361d9bfc75108c3ad1c1b6db28b1be59
+refs/heads/master: 9598c82dcacadc3b9daa8170613fd054c6124d30
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index f88720b3df8b..6cdff849fc19 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -1370,6 +1370,9 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
 			 */
 			if (task_sleep && parent_entity(se))
 				set_next_buddy(parent_entity(se));
+
+			/* avoid re-evaluating load for this entity */
+			se = parent_entity(se);
 			break;
 		}
 		flags |= DEQUEUE_SLEEP;