diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-09-16 21:54:07 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-09-16 21:54:07 -0400 |
| commit | 389e067032fbb96e439abafae848dd447e4cafb4 (patch) | |
| tree | 9b5fdebaf55ad4e9d195412dbfbf10a7a8042aea /kernel/time/clocksource.c | |
| parent | 19c3205ceaffc8f860acf61537fa211087e4b8fc (diff) | |
| parent | a97ad0c4b447a132a322cedc3a5f7fa4cab4b304 (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.c | 1 |
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) { } | |||
| 479 | static inline void clocksource_resume_watchdog(void) { } | 479 | static inline void clocksource_resume_watchdog(void) { } |
| 480 | static inline int __clocksource_watchdog_kthread(void) { return 0; } | 480 | static inline int __clocksource_watchdog_kthread(void) { return 0; } |
| 481 | static bool clocksource_is_watchdog(struct clocksource *cs) { return false; } | 481 | static bool clocksource_is_watchdog(struct clocksource *cs) { return false; } |
| 482 | void clocksource_mark_unstable(struct clocksource *cs) { } | ||
| 482 | 483 | ||
| 483 | #endif /* CONFIG_CLOCKSOURCE_WATCHDOG */ | 484 | #endif /* CONFIG_CLOCKSOURCE_WATCHDOG */ |
| 484 | 485 | ||