On Thu, 2013-04-25 at 14:55 +0200, Sebastian Andrzej Siewior wrote: > 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 :)
-Werror= CC kernel/hrtimer.o kernel/hrtimer.c: In function ‘__hrtimer_start_range_ns’: kernel/hrtimer.c:1045:7: error: implicit declaration of function ‘hrtimer_rt_defer’ [-Werror=implicit-function-declaration] kernel/hrtimer.c: At top level: kernel/hrtimer.c:1416:12: error: static declaration of ‘hrtimer_rt_defer’ follows non-static declaration kernel/hrtimer.c:1045:10: note: previous implicit declaration of ‘hrtimer_rt_defer’ was here cc1: some warnings being treated as errors make[1]: *** [kernel/hrtimer.o] Error 1 make: *** [kernel/hrtimer.o] Error 2 git@marge:~/linux-2.6> -- 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/
