From b36105ed3dd129ffcfa40570360ff9f2b038a510 Mon Sep 17 00:00:00 2001
From: Roman Zippel <zippel@linux-m68k.org>
Date: Wed, 15 Feb 2006 15:17:40 -0800
Subject: [PATCH] --- yaml --- r: 20345 b: refs/heads/master c:
 b2ee9dbfad14ba8e34a589d552ddc67300a26bec h: refs/heads/master i:   20343:
 ca16d49ee3067838ca2a16d3a5a6672a30d57ae5 v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/ktime.h | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 34d12031147a..a6c6cfa36f10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f6164f3092832e0d9b12eed52e09a76bf39c64a
+refs/heads/master: b2ee9dbfad14ba8e34a589d552ddc67300a26bec
diff --git a/trunk/include/linux/ktime.h b/trunk/include/linux/ktime.h
index 6aca67a569a2..f3dec45ef874 100644
--- a/trunk/include/linux/ktime.h
+++ b/trunk/include/linux/ktime.h
@@ -96,10 +96,16 @@ static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
 		({ (ktime_t){ .tv64 = (kt).tv64 + (nsval) }; })
 
 /* convert a timespec to ktime_t format: */
-#define timespec_to_ktime(ts)		ktime_set((ts).tv_sec, (ts).tv_nsec)
+static inline ktime_t timespec_to_ktime(struct timespec ts)
+{
+	return ktime_set(ts.tv_sec, ts.tv_nsec);
+}
 
 /* convert a timeval to ktime_t format: */
-#define timeval_to_ktime(tv)		ktime_set((tv).tv_sec, (tv).tv_usec * 1000)
+static inline ktime_t timeval_to_ktime(struct timeval tv)
+{
+	return ktime_set(tv.tv_sec, tv.tv_usec * NSEC_PER_USEC);
+}
 
 /* Map the ktime_t to timespec conversion to ns_to_timespec function */
 #define ktime_to_timespec(kt)		ns_to_timespec((kt).tv64)