Re: [PATCH] x86, clocksource, fix !CONFIG_CLOCKSOURCE_WATCHDOGcompile

From: Thomas Gleixner
Date: Fri Feb 22 2013 - 15:14:29 EST


On Fri, 22 Feb 2013, Prarit Bhargava wrote:

> If I explicitly disable the clocksource watchdog in the x86 Kconfig,
> the x86 kernel will not compile unless this is properly defined.

You shouldn't do that. :)

> Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
> Cc: John Stultz <john.stultz@xxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: x86@xxxxxxxxxx
> ---
> kernel/time/clocksource.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
> index c958338..e04821f 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; }
> +void clocksource_mark_unstable(struct clocksource *cs) { }

Unless this is defined as

> +static inline void clocksource_mark_unstable(struct clocksource *cs) { }

Right?

tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/