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>
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 7021e6d..1b40641 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c
@@ -1036,7 +1036,7 @@ && 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