aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-09-22 17:55:46 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-23 05:02:31 -0400
commit006c75f146e58e080d2b2725a6664f71886e112b (patch)
tree63d4e651021422aa1b316568661c6a104aeb2ba1 /kernel
parentcaea8a03702c147e8ae90da0801e7ba8297b1d46 (diff)
sched: clarify ifdef tangle
- Add some comments to try to make the ifdef puzzle a bit clearer - Explicitly inline one of the three init_hrtick() implementations. Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index ad9d39b021f8..927c9307cd00 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1102,7 +1102,7 @@ static void hrtick_start(struct rq *rq, u64 delay)
1102 hrtimer_start(&rq->hrtick_timer, ns_to_ktime(delay), HRTIMER_MODE_REL); 1102 hrtimer_start(&rq->hrtick_timer, ns_to_ktime(delay), HRTIMER_MODE_REL);
1103} 1103}
1104 1104
1105static void init_hrtick(void) 1105static inline void init_hrtick(void)
1106{ 1106{
1107} 1107}
1108#endif /* CONFIG_SMP */ 1108#endif /* CONFIG_SMP */
@@ -1121,7 +1121,7 @@ static void init_rq_hrtick(struct rq *rq)
1121 rq->hrtick_timer.function = hrtick; 1121 rq->hrtick_timer.function = hrtick;
1122 rq->hrtick_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ; 1122 rq->hrtick_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ;
1123} 1123}
1124#else 1124#else /* CONFIG_SCHED_HRTICK */
1125static inline void hrtick_clear(struct rq *rq) 1125static inline void hrtick_clear(struct rq *rq)
1126{ 1126{
1127} 1127}
@@ -1133,7 +1133,7 @@ static inline void init_rq_hrtick(struct rq *rq)
1133static inline void init_hrtick(void) 1133static inline void init_hrtick(void)
1134{ 1134{
1135} 1135}
1136#endif 1136#endif /* CONFIG_SCHED_HRTICK */
1137 1137
1138/* 1138/*
1139 * resched_task - mark a task 'to be rescheduled now'. 1139 * resched_task - mark a task 'to be rescheduled now'.