From 3bed0a76cacc225e24f96b02143d2be0b0b53e73 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Wed, 10 Mar 2010 17:07:24 +0100
Subject: [PATCH] --- yaml --- r: 187901 b: refs/heads/master c:
 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc h: refs/heads/master i:   187899:
 2fddf712fc55e040d2d7f53f1c45ee65c1056c31 v: v3

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

diff --git a/[refs] b/[refs]
index c685811fe45e..5e5478b28b82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4
+refs/heads/master: 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc
diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c
index bf3e38fdbe6d..c4fb42a66cab 100644
--- a/trunk/kernel/sched_rt.c
+++ b/trunk/kernel/sched_rt.c
@@ -1146,7 +1146,12 @@ static struct task_struct *pick_next_highest_task_rt(struct rq *rq, int cpu)
 		if (next && next->prio < idx)
 			continue;
 		list_for_each_entry(rt_se, array->queue + idx, run_list) {
-			struct task_struct *p = rt_task_of(rt_se);
+			struct task_struct *p;
+
+			if (!rt_entity_is_task(rt_se))
+				continue;
+
+			p = rt_task_of(rt_se);
 			if (pick_rt_task(rq, p, cpu)) {
 				next = p;
 				break;