The following commit has been merged into the timers/core branch of tip: Commit-ID: a3356a079da268cd35460d9bfe052c74383e179b Gitweb: https://git.kernel.org/tip/a3356a079da268cd35460d9bfe052c74383e179b Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Sat, 12 Dec 2020 18:29:20 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Sat, 12 Dec 2020 18:35:12 +01:00 ntp: Fix build error Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- include/linux/timekeeping.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 7f7e4a3..929d3f3 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -303,6 +303,8 @@ extern int persistent_clock_is_local; extern void read_persistent_clock64(struct timespec64 *ts); void read_persistent_wall_and_boot_offset(struct timespec64 *wall_clock, struct timespec64 *boot_offset); +#ifdef CONFIG_GENERIC_CMOS_UPDATE extern int update_persistent_clock64(struct timespec64 now); +#endif #endif
|