---

yaml --- r: 350125 b: refs/heads/master c: 1158ddb h: refs/heads/master i: 350123: c484754 v: v3
git-mirror · Jan 24, 2013 · eff662a · eff662a
1 parent 51e2f6b
commit eff662a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a59f4e079d19464eebb9b06513a1d4f55fdae5ba
+refs/heads/master: 1158ddb55416855fd17abe3214298f736f00426a
diff --git a/trunk/kernel/sched/rt.c b/trunk/kernel/sched/rt.c
@@ -1889,8 +1889,11 @@ static void switched_from_rt(struct rq *rq, struct task_struct *p)
 	 * we may need to handle the pulling of RT tasks
 	 * now.
 	 */
-	if (p->on_rq && !rq->rt.rt_nr_running)
-		pull_rt_task(rq);
+	if (!p->on_rq || rq->rt.rt_nr_running)
+		return;
+
+	if (pull_rt_task(rq))
+		resched_task(rq->curr);
 }
 
 void init_sched_rt_class(void)