diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-14 21:27:52 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-14 21:27:52 -0800 |
commit | c24ce1d88781b4d2b8232967630abaa1c90724cf (patch) | |
tree | 2de9f0d6f43cdd5135ebaefdd7a77e6326fd66f1 /kernel/futex.c | |
parent | f527cf405017e60ceb28f84e2d60ab16fc34f209 (diff) | |
parent | 63070a79ba482c274bad10ac8c4b587a3e011f2c (diff) |
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 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index a6baaec44b8..221f2128a43 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2116,7 +2116,7 @@ asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val, t = timespec_to_ktime(ts); if (cmd == FUTEX_WAIT) - t = ktime_add(ktime_get(), t); + t = ktime_add_safe(ktime_get(), t); tp = &t; } /* |