From: "tip-bot2 for Ingo Molnar" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] ntp: Fix build error
Date: Sat, 12 Dec 2020 17:38:47 -0000 [thread overview]
Message-ID: <160779472752.3364.6530360000037468284.tip-bot2@tip-bot2> (raw)
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@kernel.org>
AuthorDate: Sat, 12 Dec 2020 18:29:20 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Sat, 12 Dec 2020 18:35:12 +01:00
ntp: Fix build error
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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
reply other threads:[~2020-12-12 17:39 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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160779472752.3364.6530360000037468284.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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).