X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Flinux%2Fktime.h;h=84eeecd60a02644a6cc64563747a594b8bafbb54;hb=af8c65b57aaa4ae321af34dbfc5ca7f5625263fe;hp=ed3396dcc4f753d0d7cdfe8780c679f7315bc65d;hpb=fa9799e33d362aeca4555cd6318735bab1c04d16;p=powerpc.git

diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index ed3396dcc4..84eeecd60a 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -56,7 +56,8 @@ typedef union {
 #endif
 } ktime_t;
 
-#define KTIME_MAX			(~((u64)1 << 63))
+#define KTIME_MAX			((s64)~((u64)1 << 63))
+#define KTIME_SEC_MAX			(KTIME_MAX / NSEC_PER_SEC)
 
 /*
  * ktime_t definitions when using the 64-bit scalar representation:
@@ -73,6 +74,10 @@ typedef union {
  */
 static inline ktime_t ktime_set(const long secs, const unsigned long nsecs)
 {
+#if (BITS_PER_LONG == 64)
+	if (unlikely(secs >= KTIME_SEC_MAX))
+		return (ktime_t){ .tv64 = KTIME_MAX };
+#endif
 	return (ktime_t) { .tv64 = (s64)secs * NSEC_PER_SEC + (s64)nsecs };
 }