diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-10-31 23:17:28 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-31 23:17:28 +0100 |
| commit | fb56d689fb1c8f13d4d7168abf3838657b042885 (patch) | |
| tree | a7e75f65e440d6c078c8e8eb25a2186c3c685261 /kernel/time/timekeeping.h | |
| parent | 6c1e272f962da249f289846cec944bcd1c162a49 (diff) | |
| parent | 6546911ed369af8d747215ff8b6144618e91c6ab (diff) | |
Merge branch 'fortglx/4.15/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull timekeeping updates from John Stultz:
- More y2038 work from Arnd Bergmann
- A new mechanism to allow RTC drivers to specify the resolution of the
RTC so the suspend/resume code can make informed decisions whether to
inject the suspended time or not in case of fast suspend/resume cycles.
Diffstat (limited to 'kernel/time/timekeeping.h')
| -rw-r--r-- | kernel/time/timekeeping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h index d0914676d4c5..44aec7893cdd 100644 --- a/kernel/time/timekeeping.h +++ b/kernel/time/timekeeping.h @@ -10,7 +10,7 @@ extern ktime_t ktime_get_update_offsets_now(unsigned int *cwsseq, extern int timekeeping_valid_for_hres(void); extern u64 timekeeping_max_deferment(void); -extern int timekeeping_inject_offset(struct timespec *ts); +extern void timekeeping_warp_clock(void); extern int timekeeping_suspend(void); extern void timekeeping_resume(void); |