From eff662af375ea907faef3ce428abacd2f0656170 Mon Sep 17 00:00:00 2001
From: Kirill Tkhai <tkhai@yandex.ru>
Date: Fri, 23 Nov 2012 00:02:15 +0400
Subject: [PATCH] --- yaml --- r: 350125 b: refs/heads/master c:
 1158ddb55416855fd17abe3214298f736f00426a h: refs/heads/master i:   350123:
 c484754fe455d6788bfe1719d3176c03c4ef8c3a v: v3

---
 [refs]                  | 2 +-
 trunk/kernel/sched/rt.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8b50bdad8a8c..a1460e5a93ff 100644
--- 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
index 418feb01344e..29bda5bdf2a5 100644
--- 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)