---

yaml --- r: 110731 b: refs/heads/master c: 57fdc26 h: refs/heads/master i: 110729: 9d14bf5 110727: 652a7c1 v: v3
git-mirror · Sep 23, 2008 · 5f5554b · 5f5554b
1 parent 1cedda4
commit 5f5554b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4653f803e6e0d970ffeac0efd2c01743eb6c5228
+refs/heads/master: 57fdc26d4a734a3e00c6b2fc0e1e40ff8da4dc31
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -1249,15 +1249,15 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int sync)
 	if (unlikely(se == pse))
 		return;
 
+	cfs_rq_of(pse)->next = pse;
+
 	/*
 	 * We can come here with TIF_NEED_RESCHED already set from new task
 	 * wake up path.
 	 */
 	if (test_tsk_need_resched(curr))
 		return;
 
-	cfs_rq_of(pse)->next = pse;
-
 	/*
 	 * Batch tasks do not preempt (their preemption is driven by
 	 * the tick):