Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[linux-2.6-omap-h63xx.git] / include / linux / ktime.h

diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 36c542b70c6d88152b001ca22d9b61d3af897fce..2cd7fa73d1af88df51e6bb0daf2084dbf381ca0f 100644 (file)
--- 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