From: Andrew Morton <akpm@linux-foundation.org>

Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Menage <menage@google.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/sched.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/sched.c~hook-up-group-scheduler-with-control-groups-fix kernel/sched.c
--- a/kernel/sched.c~hook-up-group-scheduler-with-control-groups-fix
+++ a/kernel/sched.c
@@ -203,7 +203,7 @@ static inline struct task_group *task_gr
 
 #ifdef CONFIG_FAIR_USER_SCHED
 	tg = p->user->tg;
-#elif CONFIG_FAIR_CGROUP_SCHED
+#elif defined(CONFIG_FAIR_CGROUP_SCHED)
 	tg = container_of(task_subsys_state(p, cpu_cgroup_subsys_id),
 				struct task_group, css);
 #else
_