diff options
| author | Prarit Bhargava <prarit@redhat.com> | 2013-02-22 15:08:56 -0500 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-07-22 16:00:17 -0700 |
| commit | 397bbf6dee50bb1f07cbdb464c41b0f5b7a85493 (patch) | |
| tree | 993a7955640d8d71dd8d07502a08655575344231 /kernel | |
| parent | 14d0e347ea2db51144a8800d7c7576db96f69983 (diff) | |
| download | op-kernel-dev-397bbf6dee50bb1f07cbdb464c41b0f5b7a85493.zip op-kernel-dev-397bbf6dee50bb1f07cbdb464c41b0f5b7a85493.tar.gz | |
clocksource: Fix !CONFIG_CLOCKSOURCE_WATCHDOG compile
If I explicitly disable the clocksource watchdog in the x86 Kconfig,
the x86 kernel will not compile unless this is properly defined.
Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/clocksource.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 50a8736..a2e72b8 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -479,6 +479,7 @@ static inline void clocksource_dequeue_watchdog(struct clocksource *cs) { } static inline void clocksource_resume_watchdog(void) { } static inline int __clocksource_watchdog_kthread(void) { return 0; } static bool clocksource_is_watchdog(struct clocksource *cs) { return false; } +void clocksource_mark_unstable(struct clocksource *cs) { } #endif /* CONFIG_CLOCKSOURCE_WATCHDOG */ |
