summaryrefslogtreecommitdiff
path: root/include/linux/time.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-07-27 22:27:06 +0400
committerJohn W. Linville <linville@tuxdriver.com>2006-07-27 22:27:06 +0400
commit20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch)
treeb4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /include/linux/time.h
parentdd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff)
parent64821324ca49f24be1a66f2f432108f96a24e596 (diff)
downloadlinux-20f99dcf417a28089ef6c877ae97f5dec2eab435.tar.xz
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/time.h')
-rw-r--r--include/linux/time.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h
index c05f8bb9a323..a5b739967b74 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -71,6 +71,18 @@ extern unsigned long mktime(const unsigned int year, const unsigned int mon,
extern void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec);
/*
+ * sub = lhs - rhs, in normalized form
+ */
+static inline struct timespec timespec_sub(struct timespec lhs,
+ struct timespec rhs)
+{
+ struct timespec ts_delta;
+ set_normalized_timespec(&ts_delta, lhs.tv_sec - rhs.tv_sec,
+ lhs.tv_nsec - rhs.tv_nsec);
+ return ts_delta;
+}
+
+/*
* Returns true if the timespec is norm, false if denorm:
*/
#define timespec_valid(ts) \