diff --git a/[refs] b/[refs] index e49e1cca3bd7..c388bd04081b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8927f49479756c1aff76e8202ad32733c965864f +refs/heads/master: a65914b3658043da27c159b8a28c5811bb0a88c9 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 10b7bedfa35a..23da93360b22 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -6784,17 +6784,14 @@ struct task_grp *sched_create_group(void) err: for_each_possible_cpu(i) { - if (tg->cfs_rq && tg->cfs_rq[i]) + if (tg->cfs_rq) kfree(tg->cfs_rq[i]); - if (tg->se && tg->se[i]) + if (tg->se) kfree(tg->se[i]); } - if (tg->cfs_rq) - kfree(tg->cfs_rq); - if (tg->se) - kfree(tg->se); - if (tg) - kfree(tg); + kfree(tg->cfs_rq); + kfree(tg->se); + kfree(tg); return ERR_PTR(-ENOMEM); }