diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 10:27:54 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 10:27:54 +0300 |
commit | 1f836f5b10f2524d33efde47d2b694b861ecf319 (patch) | |
tree | b52188b30d08bff1fe6376832753ca5e0a7e9d15 /include/linux/timekeeping32.h | |
parent | a27ad0f7da7ba3d4cf50a08ee5e2cb4b578a4a4c (diff) | |
parent | f8788d86ab28f61f7b46eb6be375f8a726783636 (diff) | |
download | linux-1f836f5b10f2524d33efde47d2b694b861ecf319.tar.xz |
Merge 5.6-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/timekeeping32.h')
-rw-r--r-- | include/linux/timekeeping32.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/include/linux/timekeeping32.h b/include/linux/timekeeping32.h index cc59cc9e0e84..266017fc9ee9 100644 --- a/include/linux/timekeeping32.h +++ b/include/linux/timekeeping32.h @@ -11,36 +11,4 @@ static inline unsigned long get_seconds(void) return ktime_get_real_seconds(); } -static inline void getnstimeofday(struct timespec *ts) -{ - struct timespec64 ts64; - - ktime_get_real_ts64(&ts64); - *ts = timespec64_to_timespec(ts64); -} - -static inline void ktime_get_ts(struct timespec *ts) -{ - struct timespec64 ts64; - - ktime_get_ts64(&ts64); - *ts = timespec64_to_timespec(ts64); -} - -static inline void getrawmonotonic(struct timespec *ts) -{ - struct timespec64 ts64; - - ktime_get_raw_ts64(&ts64); - *ts = timespec64_to_timespec(ts64); -} - -static inline void getboottime(struct timespec *ts) -{ - struct timespec64 ts64; - - getboottime64(&ts64); - *ts = timespec64_to_timespec(ts64); -} - #endif |