On 04/25/2013 02:36 PM, Mike Galbraith wrote: > hrtimer: fix hrtimer free zone build bug > > Signed-off-by: Mike Galbraith <[email protected]> > > diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c > index 2328c04..31d57a2 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 > >
hrtimer_enqueue_reprogram() returns 0 in non-high res case so everything down there is never reached. The compiler should see this :) Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
