Messages in this thread Patch in this message | | | From | Prarit Bhargava <> | Subject | [PATCH] Fix CONFIG_CLOCKSOURCE_WATCHDOG=n compile | Date | Wed, 11 Apr 2012 16:01:20 -0400 |
| |
Noticed this while debugging -- compile fails with
arch/x86/built-in.o: In function `mark_tsc_unstable': /home/linux-2.6/arch/x86/kernel/tsc.c:791: undefined reference to `clocksource_mark_unstable' make: *** [.tmp_vmlinux1] Error 1
Add in an empty function for the !CONFIG_CLOCKSOURCE_WATCHDOG case.
Signed-off-by: Prarit Bhargava <prarit@redhat.com> Cc: John Stultz <johnstul@us.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> --- include/linux/clocksource.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index fbe89e1..dac8f91 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -285,7 +285,13 @@ 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.1
| |