On 02/24/2013 12:04 PM, Prarit Bhargava wrote: > On 02/22/2013 03:14 PM, Thomas Gleixner wrote: >>> +void clocksource_mark_unstable(struct clocksource *cs) { } >> >> Unless this is defined as >> >>> +static inline void clocksource_mark_unstable(struct clocksource *cs) { } >> >> Right? > > Whups. Of course ... new patch ... > > -----8<---- > > If I explicitly disable the clocksource watchdog in the x86 Kconfig, > the x86 kernel will not compile unless this is properly defined. > > Signed-off-by: Prarit Bhargava <pra...@redhat.com> > Cc: John Stultz <john.stu...@linaro.org> > Cc: Thomas Gleixner <t...@linutronix.de> > Cc: x...@kernel.org > --- > kernel/time/clocksource.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c > index c958338..3d81a76 100644 > --- a/kernel/time/clocksource.c > +++ b/kernel/time/clocksource.c > @@ -450,6 +450,7 @@ static void clocksource_enqueue_watchdog(struct > clocksource *cs) > static inline void clocksource_dequeue_watchdog(struct clocksource *cs) { } > static inline void clocksource_resume_watchdog(void) { } > static inline int clocksource_watchdog_kthread(void *data) { return 0; } > +static inline void clocksource_mark_unstable(struct clocksource *cs) { } > > #endif /* CONFIG_CLOCKSOURCE_WATCHDOG */
Yuck. Self NACK this one ... sorry Thomas. I'm going to have to do more work on this patch ... P. > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/