Skip to content

Commit 3cabca8

Browse files
committed
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: 76e87d9 ("ntp: Consolidate the RTC update implementation") Signed-off-by: Ingo Molnar <mingo@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de>
1 parent 464d2ff commit 3cabca8

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

include/linux/timekeeping.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@ extern int persistent_clock_is_local;
303303
extern void read_persistent_clock64(struct timespec64 *ts);
304304
void read_persistent_wall_and_boot_offset(struct timespec64 *wall_clock,
305305
struct timespec64 *boot_offset);
306+
#ifdef CONFIG_GENERIC_CMOS_UPDATE
306307
extern int update_persistent_clock64(struct timespec64 now);
308+
#endif
307309

308310
#endif

0 commit comments

Comments
 (0)