From: Baolin Wang <baolin.wang@linaro.org>
To: tglx@linutronix.de
Cc: arnd@arndb.de, john.stultz@linaro.org, heenasirwani@gmail.com,
pang.xunlei@linaro.org, mingo@kernel.org, peterz@infradead.org,
linux-kernel@vger.kernel.org, baolin.wang@linaro.org,
y2038@lists.linaro.org
Subject: [PATCH v2 2/5] timekeeping: Introduce current_kernel_time64()
Date: Wed, 29 Jul 2015 20:09:43 +0800 [thread overview]
Message-ID: <d50247eb518f3803901541df92938896530c8e24.1438170155.git.baolin.wang@linaro.org> (raw)
In-Reply-To: <cover.1438170154.git.baolin.wang@linaro.org>
The current_kernel_time() is not year 2038 safe on 32bit systems
since it returns a timespec value. Introduce current_kernel_time64()
which returns a timespec64 value.
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
include/linux/timekeeping.h | 9 ++++++++-
kernel/time/timekeeping.c | 6 +++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 3aa72e6..657ea03 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -18,10 +18,17 @@ extern int do_sys_settimeofday(const struct timespec *tv,
* Kernel time accessors
*/
unsigned long get_seconds(void);
-struct timespec current_kernel_time(void);
+struct timespec64 current_kernel_time64(void);
/* does not take xtime_lock */
struct timespec __current_kernel_time(void);
+static inline struct timespec current_kernel_time(void)
+{
+ struct timespec64 now = current_kernel_time64();
+
+ return timespec64_to_timespec(now);
+}
+
/*
* timespec based interfaces
*/
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index bca3667..2d58742 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1874,7 +1874,7 @@ struct timespec __current_kernel_time(void)
return timespec64_to_timespec(tk_xtime(tk));
}
-struct timespec current_kernel_time(void)
+struct timespec64 current_kernel_time64(void)
{
struct timekeeper *tk = &tk_core.timekeeper;
struct timespec64 now;
@@ -1886,9 +1886,9 @@ struct timespec current_kernel_time(void)
now = tk_xtime(tk);
} while (read_seqcount_retry(&tk_core.seq, seq));
- return timespec64_to_timespec(now);
+ return now;
}
-EXPORT_SYMBOL(current_kernel_time);
+EXPORT_SYMBOL(current_kernel_time64);
struct timespec64 get_monotonic_coarse64(void)
{
--
1.7.9.5
next prev parent reply other threads:[~2015-07-29 12:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-30 1:44 [PATCH v2 0/5] Introduce 64bit accessors and structures required to address y2038 issues in the posix_clock subsystem Baolin Wang
2015-07-29 11:58 ` [PATCH v2 1/5] time: Introduce struct itimerspec64 Baolin Wang
2015-07-29 12:09 ` Baolin Wang [this message]
2015-07-29 12:13 ` [PATCH v2 3/5] security: Introduce security_settime64() Baolin Wang
2015-07-30 8:23 ` James Morris
2016-04-18 16:01 ` [RESEND PATCH " Arnd Bergmann
2016-04-18 16:31 ` Mark Brown
2016-04-19 1:57 ` Baolin Wang
2016-04-18 16:54 ` John Stultz
2016-04-18 17:04 ` Kees Cook
2016-04-19 19:59 ` Serge E. Hallyn
2016-04-19 2:02 ` Baolin Wang
2015-07-29 12:16 ` [PATCH v2 4/5] time: Introduce do_sys_settimeofday64() Baolin Wang
2015-07-29 12:18 ` [PATCH v2 5/5] time: Introduce timespec64_to_jiffies()/jiffies_to_timespec64() Baolin Wang
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=d50247eb518f3803901541df92938896530c8e24.1438170155.git.baolin.wang@linaro.org \
--to=baolin.wang@linaro.org \
--cc=arnd@arndb.de \
--cc=heenasirwani@gmail.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pang.xunlei@linaro.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=y2038@lists.linaro.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).