diff --git a/[refs] b/[refs] index 63a763546a17..27e1b155421f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 968c86458a5975efa7a95f832a4ec9fb21471137 +refs/heads/master: e9036b36eed4d3cdb33fa9cbcdd9888ae516889f diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 7d7d5fcca4cb..3c11ae0a948d 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -309,6 +309,8 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct rt_rq, init_rt_rq); */ static DEFINE_SPINLOCK(task_group_lock); +#ifdef CONFIG_FAIR_GROUP_SCHED + #ifdef CONFIG_SMP static int root_task_group_empty(void) { @@ -316,7 +318,6 @@ static int root_task_group_empty(void) } #endif -#ifdef CONFIG_FAIR_GROUP_SCHED #ifdef CONFIG_USER_SCHED # define INIT_TASK_GROUP_LOAD (2*NICE_0_LOAD) #else /* !CONFIG_USER_SCHED */