summaryrefslogtreecommitdiffstats
path: root/kernel/sched_rt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 14:46:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 14:46:18 -0800
commit80a186074e72e2cd61f6716d90cf32ce54981a56 (patch)
treec5f75a83498df0ea2109067b797ec7986479dda0 /kernel/sched_rt.c
parent15c989d4d14b82f43cae7efc6a7794cdd556f274 (diff)
parent3d07467b7aa91623b31d7b5888a123a2c8c8e9cc (diff)
downloadlinux-80a186074e72e2cd61f6716d90cf32ce54981a56.tar.bz2
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix pick_next_highest_task_rt() for cgroups sched: Cleanup: remove unused variable in try_to_wake_up() x86: Fix sched_clock_cpu for systems with unsynchronized TSC
Diffstat (limited to 'kernel/sched_rt.c')
-rw-r--r--kernel/sched_rt.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index 5a6ed1f0990a..b5b920ae2ea7 100644
--- a/kernel/sched_rt.c
+++ b/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;