sched: Fix pick_next_highest_task_rt() for cgroups
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Wed, 10 Mar 2010 16:07:24 +0000 (17:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 11 Mar 2010 14:21:50 +0000 (15:21 +0100)
Since pick_next_highest_task_rt() already iterates all the cgroups and
is really only interested in tasks, skip over the !task entries.

Reported-by: Dhaval Giani <dhaval.giani@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Tested-by: Dhaval Giani <dhaval.giani@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched_rt.c

index bf3e38fdbe6dc6ca0160d7f408881525928da21a..c4fb42a66cab2afd9972ba17beeb110be8e283b3 100644 (file)
@@ -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;