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