---

yaml --- r: 257170 b: refs/heads/master c: 9bbd737 h: refs/heads/master v: v3
git-mirror · Jul 21, 2011 · 1ad8451 · 1ad8451
1 parent c253f91
commit 1ad8451
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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) {
 		/*