diff --git a/[refs] b/[refs] index 6459e8799879..ef72807f6c63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9763b67fb9f3050c6da739105888327587c30c4d +refs/heads/master: 5f817d676b7b7ac4a29f5ed93063ae7a24550c12 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 474f341d6f91..3b3826ebe793 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -8362,7 +8362,7 @@ static inline void unregister_fair_sched_group(struct task_group *tg, int cpu) list_del_leaf_cfs_rq(tg->cfs_rq[cpu]); raw_spin_unlock_irqrestore(&rq->lock, flags); } -#else /* !CONFG_FAIR_GROUP_SCHED */ +#else /* !CONFIG_FAIR_GROUP_SCHED */ static inline void free_fair_sched_group(struct task_group *tg) { }