diff options
| author | Mike Galbraith <bitbucket@online.de> | 2013-04-25 14:36:14 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-04-29 20:24:09 -0400 |
| commit | 1a514356a51ac7fbd2210888b64c6d8bd9225334 (patch) | |
| tree | 79256798b4935751fac0796f80e82b9ee34d51ab | |
| parent | bc325ad7133369bcdd49b2fd338073f0edc25030 (diff) | |
hrtimer: fix hrtimer free zone build bug
Link: http://lkml.kernel.org/r/1366893374.6139.5.camel@marge.simpson.net
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Mike Galbraith <bitbucket@online.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | kernel/hrtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 2328c04aa694..31d57a2e23a2 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1036,7 +1036,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, && hrtimer_enqueue_reprogram(timer, new_base)) { if (wakeup -#ifdef CONFIG_PREEMPT_RT_BASE +#if defined(CONFIG_PREEMPT_RT_BASE) && defined(CONFIG_HIGH_RES_TIMERS) /* * Move softirq based timers away from the rbtree in * case it expired already. Otherwise we would have a |