X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fktime.h;h=ce5983225be4e6430cadbff9cc5cbf448a66e647;hb=4c4925c1f4ccd72002957c3e73b4f117f2bcf712;hp=36c542b70c6d88152b001ca22d9b61d3af897fce;hpb=0b61a2ba5dfd1620731e717d686e6ade657fd975;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 36c542b70c6..ce5983225be 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -310,6 +310,8 @@ 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
@@ -325,4 +327,10 @@ extern void ktime_get_ts(struct timespec *ts);
 /* Get the real (wall-) time in timespec format: */
 #define ktime_get_real_ts(ts)	getnstimeofday(ts)
 
+static inline ktime_t ns_to_ktime(u64 ns)
+{
+	static const ktime_t ktime_zero = { .tv64 = 0 };
+	return ktime_add_ns(ktime_zero, ns);
+}
+
 #endif