X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Flinux%2Fktime.h;h=2cd7fa73d1af88df51e6bb0daf2084dbf381ca0f;hb=7ed7fe5e82c9fc8473974fbd7389d169b8f17c77;hp=a6ddec141f96c83752ddb060079d0efa4e517aa4;hpb=f26e51f67ae6a75ffc57b96cf5fe096f75e778cb;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index a6ddec141f9..2cd7fa73d1a 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -310,13 +310,16 @@ static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)
 	return ktime_sub_ns(kt, usec * 1000);
 }
 
+extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);
+
 /*
  * The resolution of the clocks. The resolution value is returned in
  * the clock_getres() system call to give application programmers an
  * idea of the (in)accuracy of timers. Timer values are rounded up to
  * this resolution values.
  */
-#define KTIME_LOW_RES		(ktime_t){ .tv64 = TICK_NSEC }
+#define LOW_RES_NSEC		TICK_NSEC
+#define KTIME_LOW_RES		(ktime_t){ .tv64 = LOW_RES_NSEC }
 
 /* Get the monotonic time in timespec format: */
 extern void ktime_get_ts(struct timespec *ts);