From c4affc810fb6215d56cfd4387bc27cdb6c7bb230 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 3 Jul 2009 08:44:32 -0500 Subject: [PATCH] hrtimer: fix !rt compile commit ccc00d7be9304cfc38294192db8f63dfd8b42f4e in tip. Signed-off-by: Thomas Gleixner Signed-off-by: Paul Gortmaker --- kernel/hrtimer.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index f05d9ce..720ceb5 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -776,6 +776,13 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer, { return 0; } + +static inline int hrtimer_reprogram(struct hrtimer *timer, + struct hrtimer_clock_base *base) +{ + return 0; +} + static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { } static inline void hrtimer_init_timer_hres(struct hrtimer *timer) { } @@ -914,7 +921,7 @@ static int enqueue_hrtimer(struct hrtimer *timer, return leftmost; } -#ifdef CONFIG_PREEMPT_RT +#ifdef CONFIG_PREEMPT_SOFTIRQS # define wake_up_timer_waiters(b) wake_up(&(b)->wait) /** @@ -1299,7 +1306,6 @@ static void __run_hrtimer(struct hrtimer *timer, ktime_t *now) #ifdef CONFIG_PREEMPT_RT - static void hrtimer_rt_reprogram(int restart, struct hrtimer *timer, struct hrtimer_clock_base *base) { -- 1.7.0.4