diff --git a/[refs] b/[refs]
index 36f2b005fce9..cef50f0a045c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6492c7f83e88a3a9521793b6934d882b97afe287
+refs/heads/master: e9886ca3a93d7d041d3de8e5acebe213da777d59
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 164fe7fe0d89..07d5472dee99 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1480,16 +1480,8 @@ static unsigned long source_load(int cpu, int type);
 static unsigned long target_load(int cpu, int type);
 static unsigned long cpu_avg_load_per_task(int cpu);
 static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd);
-#else /* CONFIG_SMP */
-
-#ifdef CONFIG_FAIR_GROUP_SCHED
-static void cfs_rq_set_shares(struct cfs_rq *cfs_rq, unsigned long shares)
-{
-}
 #endif
 
-#endif /* CONFIG_SMP */
-
 #include "sched_stats.h"
 #include "sched_idletask.c"
 #include "sched_fair.c"