aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDhaval Giani <dhaval@linux.vnet.ibm.com>2008-06-24 14:09:43 -0400
committerIngo Molnar <mingo@elte.hu>2008-06-27 08:32:05 -0400
commit55e12e5e7b1d7e7c05a4be10cb5fd092c039aa78 (patch)
tree3a12d84266abfc21b1c41410a9c3f2f6d9e5d22d
parentf5bfb7d9ff73d72ee4f2f4830a6f0c9088d00f92 (diff)
sched: make sched_{rt,fair}.c ifdefs more readable
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com> Cc: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/sched_fair.c6
-rw-r--r--kernel/sched_rt.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 9bcc0030a58b..2e43d4a748c3 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -921,7 +921,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
921 hrtick_start(rq, delta, requeue); 921 hrtick_start(rq, delta, requeue);
922 } 922 }
923} 923}
924#else 924#else /* !CONFIG_SCHED_HRTICK */
925static inline void 925static inline void
926hrtick_start_fair(struct rq *rq, struct task_struct *p) 926hrtick_start_fair(struct rq *rq, struct task_struct *p)
927{ 927{
@@ -1062,7 +1062,7 @@ static int wake_idle(int cpu, struct task_struct *p)
1062 } 1062 }
1063 return cpu; 1063 return cpu;
1064} 1064}
1065#else 1065#else /* !ARCH_HAS_SCHED_WAKE_IDLE*/
1066static inline int wake_idle(int cpu, struct task_struct *p) 1066static inline int wake_idle(int cpu, struct task_struct *p)
1067{ 1067{
1068 return cpu; 1068 return cpu;
@@ -1586,7 +1586,7 @@ move_one_task_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,
1586 1586
1587 return 0; 1587 return 0;
1588} 1588}
1589#endif 1589#endif /* CONFIG_SMP */
1590 1590
1591/* 1591/*
1592 * scheduler tick hitting a task of our scheduling class: 1592 * scheduler tick hitting a task of our scheduling class:
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index 765932d0399d..47ceac9e8552 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -161,7 +161,7 @@ static inline struct rt_bandwidth *sched_rt_bandwidth(struct rt_rq *rt_rq)
161 return &rt_rq->tg->rt_bandwidth; 161 return &rt_rq->tg->rt_bandwidth;
162} 162}
163 163
164#else 164#else /* !CONFIG_RT_GROUP_SCHED */
165 165
166static inline u64 sched_rt_runtime(struct rt_rq *rt_rq) 166static inline u64 sched_rt_runtime(struct rt_rq *rt_rq)
167{ 167{
@@ -226,7 +226,7 @@ static inline struct rt_bandwidth *sched_rt_bandwidth(struct rt_rq *rt_rq)
226 return &def_rt_bandwidth; 226 return &def_rt_bandwidth;
227} 227}
228 228
229#endif 229#endif /* CONFIG_RT_GROUP_SCHED */
230 230
231#ifdef CONFIG_SMP 231#ifdef CONFIG_SMP
232static int do_balance_runtime(struct rt_rq *rt_rq) 232static int do_balance_runtime(struct rt_rq *rt_rq)
@@ -374,12 +374,12 @@ static int balance_runtime(struct rt_rq *rt_rq)
374 374
375 return more; 375 return more;
376} 376}
377#else 377#else /* !CONFIG_SMP */
378static inline int balance_runtime(struct rt_rq *rt_rq) 378static inline int balance_runtime(struct rt_rq *rt_rq)
379{ 379{
380 return 0; 380 return 0;
381} 381}
382#endif 382#endif /* CONFIG_SMP */
383 383
384static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) 384static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)
385{ 385{
@@ -1472,4 +1472,4 @@ static void print_rt_stats(struct seq_file *m, int cpu)
1472 print_rt_rq(m, cpu, rt_rq); 1472 print_rt_rq(m, cpu, rt_rq);
1473 rcu_read_unlock(); 1473 rcu_read_unlock();
1474} 1474}
1475#endif 1475#endif /* CONFIG_SCHED_DEBUG */