diff options
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 9246d9f593d1..0842c8ca534b 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -2459,7 +2459,7 @@ retry: | |||
2459 | restart->fn = futex_wait_restart; | 2459 | restart->fn = futex_wait_restart; |
2460 | restart->futex.uaddr = uaddr; | 2460 | restart->futex.uaddr = uaddr; |
2461 | restart->futex.val = val; | 2461 | restart->futex.val = val; |
2462 | restart->futex.time = abs_time->tv64; | 2462 | restart->futex.time = *abs_time; |
2463 | restart->futex.bitset = bitset; | 2463 | restart->futex.bitset = bitset; |
2464 | restart->futex.flags = flags | FLAGS_HAS_TIMEOUT; | 2464 | restart->futex.flags = flags | FLAGS_HAS_TIMEOUT; |
2465 | 2465 | ||
@@ -2480,7 +2480,7 @@ static long futex_wait_restart(struct restart_block *restart) | |||
2480 | ktime_t t, *tp = NULL; | 2480 | ktime_t t, *tp = NULL; |
2481 | 2481 | ||
2482 | if (restart->futex.flags & FLAGS_HAS_TIMEOUT) { | 2482 | if (restart->futex.flags & FLAGS_HAS_TIMEOUT) { |
2483 | t.tv64 = restart->futex.time; | 2483 | t = restart->futex.time; |
2484 | tp = &t; | 2484 | tp = &t; |
2485 | } | 2485 | } |
2486 | restart->fn = do_no_restart_syscall; | 2486 | restart->fn = do_no_restart_syscall; |