From e2d704f061a078f8ca6ed5d4eb59314b033f26c8 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Mon, 26 Oct 2009 22:24:14 +0300
Subject: [PATCH] --- yaml --- r: 168431 b: refs/heads/master c:
 e9036b36eed4d3cdb33fa9cbcdd9888ae516889f h: refs/heads/master i:   168429:
 2d0e72a053e933a36f0797d4b091d704dc4395eb   168427:
 110e2946511f597c9a5f2a11a6c392048ca862dd   168423:
 a731603368d8461c180d667622a5081b7c0c2378   168415:
 abdec71e97e04dd875f918fe7db5af716ea8dc6d v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 */