archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Ingo Molnar" <>
Cc: Ingo Molnar <>,
	Thomas Gleixner <>,,
Subject: [tip: timers/core] ntp: Fix prototype in the !CONFIG_GENERIC_CMOS_UPDATE case
Date: Sun, 13 Dec 2020 09:26:08 -0000	[thread overview]
Message-ID: <160785156829.3364.3073127459161350249.tip-bot2@tip-bot2> (raw)

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     3cabca87b329cbcbdf295be0094adbd72c7b1f67
Author:        Ingo Molnar <>
AuthorDate:    Sat, 12 Dec 2020 18:29:20 +01:00
Committer:     Ingo Molnar <>
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 <>
Acked-by: Thomas Gleixner <>
 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);
 extern int update_persistent_clock64(struct timespec64 now);

                 reply	other threads:[~2020-12-13  9:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=160785156829.3364.3073127459161350249.tip-bot2@tip-bot2 \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).