From afe16b13a1f99e7b2973d4dd46c295d5de04b904 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 27 Jun 2008 15:42:36 +0200
Subject: [PATCH] --- yaml --- r: 100245 b: refs/heads/master c:
 34e83e850f5e5ee2a18cd77a5d70d31972a632e6 h: refs/heads/master i:   100243:
 e33208e94c2f6491cc6bf79ce720b1757b891df9 v: v3

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

diff --git a/[refs] b/[refs]
index 47c4c51caeb7..56d86a8bedc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d452c9b10caeec455eb5e56a0ef4ed485178213
+refs/heads/master: 34e83e850f5e5ee2a18cd77a5d70d31972a632e6
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 7613f69f0978..058250a63b64 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1627,11 +1627,6 @@ static void update_h_load(int cpu)
 	walk_tg_tree(tg_load_down, tg_nop, cpu, NULL);
 }
 
-static void cfs_rq_set_shares(struct cfs_rq *cfs_rq, unsigned long shares)
-{
-	cfs_rq->shares = shares;
-}
-
 #else
 
 static inline void update_shares(struct sched_domain *sd)
@@ -1646,6 +1641,13 @@ static inline void update_shares_locked(struct rq *rq, struct sched_domain *sd)
 
 #endif
 
+static void cfs_rq_set_shares(struct cfs_rq *cfs_rq, unsigned long shares)
+{
+#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED)
+	cfs_rq->shares = shares;
+#endif
+}
+
 #include "sched_stats.h"
 #include "sched_idletask.c"
 #include "sched_fair.c"