From b88615698b6cbb8ec38c342f42c2563bd00ce305 Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Fri, 27 Jun 2008 21:35:50 +0200
Subject: [PATCH] --- yaml --- r: 100246 b: refs/heads/master c:
 30432094a7f506ad24997a3ba6aed913ab61c01d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 56d86a8bedc5..d014966f0217 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34e83e850f5e5ee2a18cd77a5d70d31972a632e6
+refs/heads/master: 30432094a7f506ad24997a3ba6aed913ab61c01d
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 058250a63b64..677c80b9a6b5 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1641,12 +1641,14 @@ static inline void update_shares_locked(struct rq *rq, struct sched_domain *sd)
 
 #endif
 
+#ifdef CONFIG_FAIR_GROUP_SCHED
 static void cfs_rq_set_shares(struct cfs_rq *cfs_rq, unsigned long shares)
 {
-#if defined(CONFIG_SMP) && defined(CONFIG_FAIR_GROUP_SCHED)
+#ifdef CONFIG_SMP
 	cfs_rq->shares = shares;
 #endif
 }
+#endif
 
 #include "sched_stats.h"
 #include "sched_idletask.c"