]> err.no Git - linux-2.6/commitdiff
sched: fix warning
authorVegard Nossum <vegard.nossum@gmail.com>
Fri, 27 Jun 2008 19:35:50 +0000 (21:35 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 30 Jun 2008 06:37:32 +0000 (08:37 +0200)
This patch fixes the following warning:

kernel/sched.c:1667: warning: 'cfs_rq_set_shares' defined but not used

This seems the correct way to fix this; cfs_rq_set_shares() is only used
in a single place, which is also inside #ifdef CONFIG_FAIR_GROUP_SCHED.

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/sched.c

index 058250a63b649b0d4a08f353871993539f5730df..677c80b9a6b51cab9270d07bc4fd4b94f5089ea0 100644 (file)
@@ -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"