diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:27:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-15 00:27:52 -0500 |
| commit | c24ce1d88781b4d2b8232967630abaa1c90724cf (patch) | |
| tree | 2de9f0d6f43cdd5135ebaefdd7a77e6326fd66f1 /kernel/futex_compat.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_compat.c')
| -rw-r--r-- | kernel/futex_compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index 133d558db452..7d5e4b016f39 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c | |||
| @@ -176,7 +176,7 @@ asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val, | |||
| 176 | 176 | ||
| 177 | t = timespec_to_ktime(ts); | 177 | t = timespec_to_ktime(ts); |
| 178 | if (cmd == FUTEX_WAIT) | 178 | if (cmd == FUTEX_WAIT) |
| 179 | t = ktime_add(ktime_get(), t); | 179 | t = ktime_add_safe(ktime_get(), t); |
| 180 | tp = &t; | 180 | tp = &t; |
| 181 | } | 181 | } |
| 182 | if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE) | 182 | if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE) |