From 1ad8451ef8904d185e1c641527eb7ab741f3cf71 Mon Sep 17 00:00:00 2001
From: Paul Turner <pjt@google.com>
Date: Tue, 5 Jul 2011 19:07:21 -0700
Subject: [PATCH] --- yaml --- r: 257170 b: refs/heads/master c:
 9bbd7374361d9bfc75108c3ad1c1b6db28b1be59 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b1d00274e74b..53cba3ec8a3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 994bf1c92270e3d7731ea08f1d1bd7a668314e60
+refs/heads/master: 9bbd7374361d9bfc75108c3ad1c1b6db28b1be59
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index e7d67a9e259a..f88720b3df8b 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -1919,8 +1919,8 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
 	if (!sched_feat(WAKEUP_PREEMPT))
 		return;
 
-	update_curr(cfs_rq);
 	find_matching_se(&se, &pse);
+	update_curr(cfs_rq_of(se));
 	BUG_ON(!pse);
 	if (wakeup_preempt_entity(se, pse) == 1) {
 		/*