diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-07-03 08:44:32 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-07-29 23:30:46 +0200 |
| commit | ccc00d7be9304cfc38294192db8f63dfd8b42f4e (patch) | |
| tree | 0dbe1eea53d6ddfb2f3c9f8143f6d9eb8e8d79ba /kernel/hrtimer.c | |
| parent | b275903a1dc4442383a05137ea6a8985605291e9 (diff) | |
| download | lwn-ccc00d7be9304cfc38294192db8f63dfd8b42f4e.tar.gz lwn-ccc00d7be9304cfc38294192db8f63dfd8b42f4e.zip | |
hrtimer: fix !rt compile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index de59fe079e14..875327a43ad4 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -736,6 +736,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) { } @@ -858,7 +865,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) /** @@ -1232,7 +1239,6 @@ static void __run_hrtimer(struct hrtimer *timer) #ifdef CONFIG_PREEMPT_RT - static void hrtimer_rt_reprogram(int restart, struct hrtimer *timer, struct hrtimer_clock_base *base) { |