Messages in this thread Patch in this message | | | From | Prarit Bhargava <> | Subject | [PATCH] x86, clocksource, fix !CONFIG_CLOCKSOURCE_WATCHDOG compile [v2] | Date | Sun, 3 Mar 2013 07:20:14 -0500 |
| |
If I explicitly disable the clocksource watchdog in the x86 Kconfig, the x86 kernel will not compile unless this is properly defined.
v2: Oops ... move this to clocksource.h where it belongs
Signed-off-by: Prarit Bhargava <prarit@redhat.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86@kernel.org --- include/linux/clocksource.h | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 27cfda4..8292fe6 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -285,7 +285,12 @@ extern void clocksource_change_rating(struct clocksource *cs, int rating); extern void clocksource_suspend(void); extern void clocksource_resume(void); extern struct clocksource * __init __weak clocksource_default_clock(void); +#ifdef CONFIG_CLOCKSOURCE_WATCHDOG extern void clocksource_mark_unstable(struct clocksource *cs); +#else +static inline void clocksource_mark_unstable(struct clocksource *cs) { } +#endif + extern void clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec); -- 1.7.9.3
| |