From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
Arnd Bergmann <arnd.bergmann@linaro.org>,
"pang.xunlei" <pang.xunlei@linaro.org>,
Miroslav Lichvar <mlichvar@redhat.com>,
Richard Cochran <richardcochran@gmail.com>,
Prarit Bhargava <prarit@redhat.com>,
Alessandro Zummo <a.zummo@towertech.it>
Subject: [PATCH 08/12] time: Expose get_monotonic_corase64() for in-kernel uses
Date: Fri, 21 Nov 2014 11:44:14 -0800 [thread overview]
Message-ID: <1416599058-13836-9-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1416599058-13836-1-git-send-email-john.stultz@linaro.org>
Adds a timespec64 based get_monotonic_coarse64() implementation
that can be used as we convert internal users of
get_monotonic_corase away from usingtimespecs.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arnd Bergmann <arnd.bergmann@linaro.org>
Cc: pang.xunlei <pang.xunlei@linaro.org>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
include/linux/timekeeping.h | 11 ++++++++++-
kernel/time/timekeeping.c | 4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index e40a8d6..8cab4b7 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -25,7 +25,7 @@ struct timespec __current_kernel_time(void);
/*
* timespec based interfaces
*/
-struct timespec get_monotonic_coarse(void);
+struct timespec64 get_monotonic_coarse64(void);
extern void getrawmonotonic64(struct timespec64 *ts);
extern void ktime_get_ts64(struct timespec64 *ts);
@@ -66,6 +66,10 @@ static inline void getrawmonotonic(struct timespec *ts)
getrawmonotonic64(ts);
}
+static inline struct timespec get_monotonic_coarse(void)
+{
+ return get_monotonic_coarse64();
+}
#else
/**
* Deprecated. Use do_settimeofday64().
@@ -118,6 +122,11 @@ static inline void getrawmonotonic(struct timespec *ts)
getrawmonotonic64(&ts64);
*ts = timespec64_to_timespec(ts64);
}
+
+static inline struct timespec get_monotonic_coarse(void)
+{
+ return timespec64_to_timespec(get_monotonic_coarse64());
+}
#endif
extern void getboottime(struct timespec *ts);
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index b329586..62440b1 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1644,7 +1644,7 @@ struct timespec current_kernel_time(void)
}
EXPORT_SYMBOL(current_kernel_time);
-struct timespec get_monotonic_coarse(void)
+struct timespec64 get_monotonic_coarse64(void)
{
struct timekeeper *tk = &tk_core.timekeeper;
struct timespec64 now, mono;
@@ -1660,7 +1660,7 @@ struct timespec get_monotonic_coarse(void)
set_normalized_timespec64(&now, now.tv_sec + mono.tv_sec,
now.tv_nsec + mono.tv_nsec);
- return timespec64_to_timespec(now);
+ return now;
}
/*
--
1.9.1
next prev parent reply other threads:[~2014-11-21 19:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-21 19:44 [PATCH 00/12] John Stultz
2014-11-21 19:44 ` [PATCH 01/12] time: Rename udelay_test.c to test_udelay.c John Stultz
2014-11-21 23:30 ` Kees Cook
2014-11-22 3:45 ` Greg KH
2014-11-24 22:14 ` David Riley
2014-11-21 19:44 ` [PATCH 02/12] time: Avoid possible NTP adjustment mult overflow John Stultz
2014-11-21 19:44 ` [PATCH 03/12] time: Complete NTP adjustment threshold judging conditions John Stultz
2014-11-21 19:44 ` [PATCH 04/12] time: Provide y2038 safe do_settimeofday() replacement John Stultz
2014-11-21 19:44 ` [PATCH 05/12] time: Provide y2038 safe timekeeping_inject_sleeptime() replacement John Stultz
2014-11-21 19:44 ` [PATCH 06/12] time: Provide y2038 safe mktime() replacement John Stultz
2014-11-21 19:44 ` [PATCH 07/12] time: Expose getrawmonotonic64 for in-kernel uses John Stultz
2014-11-21 19:44 ` John Stultz [this message]
2014-11-21 19:44 ` [PATCH 09/12] time: Fixup comments to reflect usage of timespec64 John Stultz
2014-11-21 19:44 ` [PATCH 10/12] rtc/lib: Provide y2038 safe rtc_tm_to_time()/rtc_time_to_tm() replacement John Stultz
2014-11-21 19:44 ` [PATCH 11/12] rtc: Update suspend/resume timing to use 64bit time John Stultz
2014-11-21 19:44 ` [PATCH 12/12] time: Remove timekeeping_inject_sleeptime() John Stultz
2014-11-21 19:53 ` [PATCH 00/12] John Stultz
2014-11-21 20:07 ` Arnd Bergmann
2014-11-21 20:17 ` John Stultz
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=1416599058-13836-9-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=a.zummo@towertech.it \
--cc=arnd.bergmann@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mlichvar@redhat.com \
--cc=pang.xunlei@linaro.org \
--cc=prarit@redhat.com \
--cc=richardcochran@gmail.com \
--cc=tglx@linutronix.de \
/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