diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-19 09:09:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-19 09:09:15 +0200 |
| commit | 1cdad71537b42d0f0bf247772942ce678e4e8898 (patch) | |
| tree | 58caef683e4739907e0ae147bead71a5b19e2207 /kernel/sched.c | |
| parent | 20b6331bfed1f07ba1e5006889a5d64adc53615e (diff) | |
| parent | 15a8641eadb492ef7c5489faa25256967bdfd303 (diff) | |
Merge branch 'sched' into sched-devel
Conflicts:
kernel/sched_rt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index cc1d558406f..5b307da827e 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -7697,7 +7697,6 @@ static void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq, else rt_se->rt_rq = parent->my_q; - rt_se->rt_rq = &rq->rt; rt_se->my_q = rt_rq; rt_se->parent = parent; INIT_LIST_HEAD(&rt_se->run_list); @@ -8420,7 +8419,7 @@ static unsigned long to_ratio(u64 period, u64 runtime) #ifdef CONFIG_CGROUP_SCHED static int __rt_schedulable(struct task_group *tg, u64 period, u64 runtime) { - struct task_group *tgi, *parent = tg->parent; + struct task_group *tgi, *parent = tg ? tg->parent : NULL; unsigned long total = 0; if (!parent) { |