diff --git a/[refs] b/[refs] index 01eb1b5f3c87..2851181871b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95e904c7da715aa2dbfb595da66b63de37a0bb04 +refs/heads/master: 49307fd6f72bdd68cc2bd23e7da0bcfecf8087c9 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 04228524d160..320e9a43d4cc 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -8350,7 +8350,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) {