From 81d31d56c8a0767ea6f3a9975f693f6154f3c30a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot@wolfpond.org>
Date: Sat, 7 Nov 2015 17:11:27 +0100
Subject: [PATCH] drm: Add ktime_get_raw_ns()

---
 sys/dev/drm/include/linux/ktime.h             |  2 +
 .../include/linux/{ktime.h => timekeeping.h}  | 51 +++----------------
 2 files changed, 8 insertions(+), 45 deletions(-)
 copy sys/dev/drm/include/linux/{ktime.h => timekeeping.h} (64%)

diff --git a/sys/dev/drm/include/linux/ktime.h b/sys/dev/drm/include/linux/ktime.h
index 2183cf3773..25a936aa06 100644
--- a/sys/dev/drm/include/linux/ktime.h
+++ b/sys/dev/drm/include/linux/ktime.h
@@ -75,4 +75,6 @@ static inline ktime_t ktime_get(void)
 	return kt;
 }
 
+#include <linux/timekeeping.h>
+
 #endif	/* _LINUX_KTIME_H_ */
diff --git a/sys/dev/drm/include/linux/ktime.h b/sys/dev/drm/include/linux/timekeeping.h
similarity index 64%
copy from sys/dev/drm/include/linux/ktime.h
copy to sys/dev/drm/include/linux/timekeeping.h
index 2183cf3773..f7bc591310 100644
--- a/sys/dev/drm/include/linux/ktime.h
+++ b/sys/dev/drm/include/linux/timekeeping.h
@@ -24,55 +24,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_KTIME_H_
-#define _LINUX_KTIME_H_
+#ifndef _LINUX_TIMEKEEPING_H_
+#define _LINUX_TIMEKEEPING_H_
 
-#include <linux/time.h>
-#include <linux/jiffies.h>
-
-/* time values in nanoseconds */
-union ktime {
-	int64_t tv64;
-};
-
-typedef union ktime ktime_t;
-
-static inline int64_t ktime_to_ns(ktime_t kt)
-{
-	return kt.tv64;
-}
-
-static inline struct timeval ktime_to_timeval(ktime_t kt)
-{
-	return ns_to_timeval(kt.tv64);
-}
-
-static inline ktime_t ktime_add_ns(ktime_t kt, int64_t ns)
-{
-	ktime_t res;
-
-	res.tv64 = kt.tv64 + ns;
-	return kt;
-}
-
-static inline ktime_t ktime_sub_ns(ktime_t kt, int64_t ns)
-{
-	ktime_t res;
-
-	res.tv64 = kt.tv64 - ns;
-	return kt;
-}
-
-#define NSEC_PER_SEC	1000000000L
-
-static inline ktime_t ktime_get(void)
+static inline u64 ktime_get_raw_ns(void)
 {
 	struct timespec ts;
-	ktime_t kt;
 
 	nanouptime(&ts);
-	kt.tv64 = (ts.tv_sec * NSEC_PER_SEC) + ts.tv_nsec;
-	return kt;
+
+	return (ts.tv_sec * NSEC_PER_SEC) + ts.tv_nsec;
 }
 
-#endif	/* _LINUX_KTIME_H_ */
+#endif	/* _LINUX_TIMEKEEPING_H_ */
-- 
2.41.0