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/ntp_internal.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/ntp_internal.h')
| -rw-r--r-- | kernel/time/ntp_internal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/time/ntp_internal.h b/kernel/time/ntp_internal.h index d8a7c11fa71a..74b52cd48209 100644 --- a/kernel/time/ntp_internal.h +++ b/kernel/time/ntp_internal.h @@ -7,7 +7,6 @@ extern void ntp_clear(void); extern u64 ntp_tick_length(void); extern ktime_t ntp_get_next_leap(void); extern int second_overflow(time64_t secs); -extern int ntp_validate_timex(struct timex *); extern int __do_adjtimex(struct timex *, struct timespec64 *, s32 *); extern void __hardpps(const struct timespec64 *, const struct timespec64 *); #endif /* _LINUX_NTP_INTERNAL_H */ |