From cfdbfd3c10be50d320a955994434c547359030b6 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 6 Dec 2006 20:37:38 -0800
Subject: [PATCH] --- yaml --- r: 42847 b: refs/heads/master c:
 cfd1893477fa94bb0915e39afa2f044ac978b5c6 h: refs/heads/master i:   42845:
 71d931415a39c92048f41d991faba06c363f1917   42843:
 a70452e833c4773d85576192aa12bb9172d78373   42839:
 8389d7ae7d31070ba49bab56aaf905903cdbef4d   42831:
 a8a47037d1920334f3bad98868bf24fddc9f86fc   42815:
 5f72f0cb19743c2a3de58a54fec1d428145449ae v: v3

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

diff --git a/[refs] b/[refs]
index bd5f44060ece..89109b667456 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b46be05004abb419e303e66e143eed9f8a6e9f3f
+refs/heads/master: cfd1893477fa94bb0915e39afa2f044ac978b5c6
diff --git a/trunk/include/linux/ktime.h b/trunk/include/linux/ktime.h
index 84eeecd60a02..611f17f79eef 100644
--- a/trunk/include/linux/ktime.h
+++ b/trunk/include/linux/ktime.h
@@ -248,9 +248,9 @@ static inline struct timeval ktime_to_timeval(const ktime_t kt)
  *
  * Returns the scalar nanoseconds representation of kt
  */
-static inline u64 ktime_to_ns(const ktime_t kt)
+static inline s64 ktime_to_ns(const ktime_t kt)
 {
-	return (u64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec;
+	return (s64) kt.tv.sec * NSEC_PER_SEC + kt.tv.nsec;
 }
 
 #endif