From 112892bbc67c0327a655f96a637d8c6745156013 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 16 May 2012 21:34:23 -0700
Subject: [PATCH] --- yaml --- r: 310472 b: refs/heads/master c:
 454c79999f7eaedcdf4c15c449e43902980cbdf5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b04242047179..9ba84b7e10d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29baa7478ba47d746e3625c91d3b2afbf46b4312
+refs/heads/master: 454c79999f7eaedcdf4c15c449e43902980cbdf5
diff --git a/trunk/kernel/sched/rt.c b/trunk/kernel/sched/rt.c
index 295da737b6fe..2a4e8dffbd6b 100644
--- a/trunk/kernel/sched/rt.c
+++ b/trunk/kernel/sched/rt.c
@@ -1985,6 +1985,8 @@ static void watchdog(struct rq *rq, struct task_struct *p)
 
 static void task_tick_rt(struct rq *rq, struct task_struct *p, int queued)
 {
+	struct sched_rt_entity *rt_se = &p->rt;
+
 	update_curr_rt(rq);
 
 	watchdog(rq, p);
@@ -2002,12 +2004,15 @@ static void task_tick_rt(struct rq *rq, struct task_struct *p, int queued)
 	p->rt.time_slice = RR_TIMESLICE;
 
 	/*
-	 * Requeue to the end of queue if we are not the only element
-	 * on the queue:
+	 * Requeue to the end of queue if we (and all of our ancestors) are the
+	 * only element on the queue
 	 */
-	if (p->rt.run_list.prev != p->rt.run_list.next) {
-		requeue_task_rt(rq, p, 0);
-		set_tsk_need_resched(p);
+	for_each_sched_rt_entity(rt_se) {
+		if (rt_se->run_list.prev != rt_se->run_list.next) {
+			requeue_task_rt(rq, p, 0);
+			set_tsk_need_resched(p);
+			return;
+		}
 	}
 }