summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-15 08:27:52 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-15 08:27:52 +0300
commitc24ce1d88781b4d2b8232967630abaa1c90724cf (patch)
tree2de9f0d6f43cdd5135ebaefdd7a77e6326fd66f1 /include
parentf527cf405017e60ceb28f84e2d60ab16fc34f209 (diff)
parent63070a79ba482c274bad10ac8c4b587a3e011f2c (diff)
downloadlinux-c24ce1d88781b4d2b8232967630abaa1c90724cf.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt: hrtimer: catch expired CLOCK_REALTIME timers early hrtimer: check relative timeouts for overflow
Diffstat (limited to 'include')
-rw-r--r--include/linux/ktime.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 36c542b70c6d..2cd7fa73d1af 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