return ts;
}
+static inline struct timespec timespec64_to_timespec(const struct timespec64 ts)
+{
+ return ts;
+}
+
#else
struct timespec64 {
time64_t tv_sec; /* seconds */
ret.tv_nsec = ts.tv_nsec;
return ret;
}
+
+static inline struct timespec timespec64_to_timespec(const struct timespec64 ts64)
+{
+ struct timespec ret;
+
+ ret.tv_sec = (time_t)ts64.tv_sec;
+ ret.tv_nsec = ts64.tv_nsec;
+ return ret;
+}
#endif /* __BITS_PER_LONG != 64 */
#endif /* HAVE_TIMESPEC64 */
+#ifndef HAVE_KTIME_ADD
+# define ktime_add(lhs, rhs) ({ (ktime_t){ .tv64 = (lhs).tv64 + (rhs).tv64 }; })
+#endif /* !HAVE_KTIME_ADD */
+
+#ifndef HAVE_KTIME_AFTER
+static inline bool ktime_after(const ktime_t cmp1, const ktime_t cmp2)
+{
+ return cmp1.tv64 > cmp2.tv64;
+}
+#endif /* !HAVE_KTIME_AFTER */
+
#ifndef HAVE_KTIME_GET_TS64
void ktime_get_ts64(struct timespec64 *ts);
#endif /* HAVE_KTIME_GET_TS */
time64_t ktime_get_seconds(void);
#endif /* HAVE_KTIME_GET_SECONDS */
-#ifndef HAVE_KTIME_GET_REAL_NS
+#ifdef NEED_KTIME_GET_REAL_NS
static inline u64 ktime_get_real_ns(void)
{
return ktime_to_ns(ktime_get_real());
}
-#endif /* HAVE_KTIME_GET_NS */
+#endif /* NEED_KTIME_GET_REAL_NS */
+
+#ifndef HAVE_KTIME_TO_TIMESPEC64
+static inline struct timespec64 ktime_to_timespec64(ktime_t kt)
+{
+ struct timespec ts = ns_to_timespec((kt).tv64);
+
+ return timespec_to_timespec64(ts);
+}
+#endif /* HAVE_KTIME_TO_TIMESPEC64 */
+
+#ifndef HAVE_TIMESPEC64_SUB
+static inline struct timespec64
+timespec64_sub(struct timespec64 later, struct timespec64 earlier)
+{
+ struct timespec diff;
+
+ diff = timespec_sub(timespec64_to_timespec(later),
+ timespec64_to_timespec(earlier));
+ return timespec_to_timespec64(diff);
+}
+#endif
+
+#ifndef HAVE_TIMESPEC64_TO_KTIME
+static inline ktime_t timespec64_to_ktime(struct timespec64 ts)
+{
+ return ktime_set(ts.tv_sec, ts.tv_nsec);
+}
+#endif
static inline int cfs_time_before(cfs_time_t t1, cfs_time_t t2)
{
return d / msecs_to_jiffies(MSEC_PER_SEC);
}
-static inline void cfs_duration_usec(cfs_duration_t d, struct timeval *s)
-{
-#if (BITS_PER_LONG == 32)
- if (msecs_to_jiffies(MSEC_PER_SEC) > 4096) {
- __u64 t;
-
- s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
- t = (d - (cfs_duration_t)s->tv_sec *
- msecs_to_jiffies(MSEC_PER_SEC)) * USEC_PER_SEC;
- do_div(t, msecs_to_jiffies(MSEC_PER_SEC));
- s->tv_usec = t;
- } else {
- s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
- s->tv_usec = ((d - (cfs_duration_t)s->tv_sec *
- msecs_to_jiffies(MSEC_PER_SEC)) *
- USEC_PER_SEC) / msecs_to_jiffies(MSEC_PER_SEC);
- }
-#else
- s->tv_sec = d / msecs_to_jiffies(MSEC_PER_SEC);
- s->tv_usec = ((d - (cfs_duration_t)s->tv_sec *
- msecs_to_jiffies(MSEC_PER_SEC)) *
- USEC_PER_SEC) / msecs_to_jiffies(MSEC_PER_SEC);
-#endif
-}
-
static inline void cfs_duration_nsec(cfs_duration_t d, struct timespec *s)
{
#if (BITS_PER_LONG == 32)