summaryrefslogtreecommitdiff
path: root/kernel/time/clocksource.c
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-09-16 18:54:07 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-09-16 18:54:07 -0700
commit389e067032fbb96e439abafae848dd447e4cafb4 (patch)
tree9b5fdebaf55ad4e9d195412dbfbf10a7a8042aea /kernel/time/clocksource.c
parent19c3205ceaffc8f860acf61537fa211087e4b8fc (diff)
parenta97ad0c4b447a132a322cedc3a5f7fa4cab4b304 (diff)
Merge branch 'fortglx/3.12/time' into fortglx/3.13/time
Merge in the timekeeping changes that missed 3.12 Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time/clocksource.c')
-rw-r--r--kernel/time/clocksource.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
index 637a14af6c21..64cf63ca09cc 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 */