diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-20 06:43:05 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-20 06:43:05 +0200 |
| commit | e5af5ff34cf037ac7bb70976161427dc40bf4a96 (patch) | |
| tree | 3a0c3f8e859562c333e5229ac9fe09d004a45405 /kernel/time/ntp_internal.h | |
| parent | 30587589251a00974115e0815ac316980f48dbb5 (diff) | |
| parent | 39232ed5a1793f67b11430c43ed8a9ed6e96c6eb (diff) | |
| download | blackbird-op-linux-e5af5ff34cf037ac7bb70976161427dc40bf4a96.tar.gz blackbird-op-linux-e5af5ff34cf037ac7bb70976161427dc40bf4a96.zip | |
Merge tag 'fortglx/4.19/time-part2' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull the second set of timekeeping things for 4.19 from John Stultz
* NTP argument clenaups and constification from Ondrej Mosnacek
* Fix to avoid RTC injecting sleeptime when suspend fails from
Mukesh Ojha
* Broading suspsend-timing to include non-stop clocksources that
aren't currently used for timekeeping from Baolin Wang
Diffstat (limited to 'kernel/time/ntp_internal.h')
| -rw-r--r-- | kernel/time/ntp_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/ntp_internal.h b/kernel/time/ntp_internal.h index 909bd1f1bfb1..c24b0e13f011 100644 --- a/kernel/time/ntp_internal.h +++ b/kernel/time/ntp_internal.h @@ -8,6 +8,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 __do_adjtimex(struct timex *, struct timespec64 *, s32 *); -extern void __hardpps(const struct timespec64 *, const struct timespec64 *); +extern int __do_adjtimex(struct timex *txc, const struct timespec64 *ts, s32 *time_tai); +extern void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts); #endif /* _LINUX_NTP_INTERNAL_H */ |
