* [tip: timers/core] ntp: Fix prototype in the !CONFIG_GENERIC_CMOS_UPDATE case
@ 2020-12-13 9:26 tip-bot2 for Ingo Molnar
0 siblings, 0 replies; only message in thread
From: tip-bot2 for Ingo Molnar @ 2020-12-13 9:26 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Ingo Molnar, Thomas Gleixner, x86, linux-kernel
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 3cabca87b329cbcbdf295be0094adbd72c7b1f67
Gitweb: https://git.kernel.org/tip/3cabca87b329cbcbdf295be0094adbd72c7b1f67
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Sat, 12 Dec 2020 18:29:20 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sun, 13 Dec 2020 10:16:31 +01:00
ntp: Fix prototype in the !CONFIG_GENERIC_CMOS_UPDATE case
In the !CONFIG_GENERIC_CMOS_UPDATE case the update_persistent_clock64() function
gets defined as a stub in ntp.c - make the prototype in <linux/timekeeping.h>
conditional on CONFIG_GENERIC_CMOS_UPDATE as well.
Fixes: 76e87d96b30b5 ("ntp: Consolidate the RTC update implementation")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-13 9:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-13 9:26 [tip: timers/core] ntp: Fix prototype in the !CONFIG_GENERIC_CMOS_UPDATE case tip-bot2 for Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).