summaryrefslogtreecommitdiffstats
path: root/include/linux/pps_kernel.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-09-28 22:21:29 +0200
committerJohn Stultz <john.stultz@linaro.org>2015-10-01 09:59:01 -0700
commit071eee45b1650d53d21c636d344bdcebd4577ed2 (patch)
tree3e22cf4327f43092c26e2eb11236379ec7320f2f /include/linux/pps_kernel.h
parent7ec88e4be461590b5a3817460c34603f76d9b3ae (diff)
downloadop-kernel-dev-071eee45b1650d53d21c636d344bdcebd4577ed2.zip
op-kernel-dev-071eee45b1650d53d21c636d344bdcebd4577ed2.tar.gz
ntp/pps: replace getnstime_raw_and_real with 64-bit version
There is exactly one caller of getnstime_raw_and_real in the kernel, which is the pps_get_ts function. This changes the caller and the implementation to work on timespec64 types rather than timespec, to avoid the time_t overflow on 32-bit architectures. For consistency with the other new functions (ktime_get_seconds, ktime_get_real_*, ...), I'm renaming the function to ktime_get_raw_and_real_ts64. We still need to convert from the internal 64-bit type to 32 bit types in the caller, but this conversion is now pushed out from getnstime_raw_and_real to pps_get_ts. A follow-up patch changes the remaining pps code to completely avoid the conversion. Acked-by: Richard Cochran <richardcochran@gmail.com> Acked-by: David S. Miller <davem@davemloft.net> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux/pps_kernel.h')
-rw-r--r--include/linux/pps_kernel.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/pps_kernel.h b/include/linux/pps_kernel.h
index 1d2cd21..b2fbd62 100644
--- a/include/linux/pps_kernel.h
+++ b/include/linux/pps_kernel.h
@@ -115,7 +115,12 @@ static inline void timespec_to_pps_ktime(struct pps_ktime *kt,
static inline void pps_get_ts(struct pps_event_time *ts)
{
- getnstime_raw_and_real(&ts->ts_raw, &ts->ts_real);
+ struct timespec64 raw, real;
+
+ ktime_get_raw_and_real_ts64(&raw, &real);
+
+ ts->ts_raw = timespec64_to_timespec(raw);
+ ts->ts_real = timespec64_to_timespec(real);
}
#else /* CONFIG_NTP_PPS */
OpenPOWER on IntegriCloud