[tip:sched/core] sched: Fix pick_next_highest_task_rt() for cgroups
in [Kernel]
|
Prev: [tip:perf/urgent] perf, ppc: Fix compile error due to new cpu notifiers
Next: [tip:sched/core] sched: Cleanup: remove unused variable in try_to_wake_up()
From: tip-bot for Peter Zijlstra on 11 Mar 2010 09:50 Commit-ID: 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc Gitweb: http://git.kernel.org/tip/3d07467b7aa91623b31d7b5888a123a2c8c8e9cc Author: Peter Zijlstra <a.p.zijlstra(a)chello.nl> AuthorDate: Wed, 10 Mar 2010 17:07:24 +0100 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Thu, 11 Mar 2010 15:21:50 +0100 sched: Fix pick_next_highest_task_rt() for cgroups 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(a)gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra(a)chello.nl> Tested-by: Dhaval Giani <dhaval.giani(a)gmail.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- kernel/sched_rt.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index bf3e38f..c4fb42a 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |