Merge tag 'v4.0-rc1' into patchwork

[linux-2.6-block.git] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index 4eeb63de7e54e895506e468acbcd4b3bed4271c6..2a5e3830e953b72cca4aeac4ec537e276f0f355b 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2217,7 +2217,7 @@ retry:
        if (!abs_time)
                goto out;
 
-       restart = &current_thread_info()->restart_block;
+       restart = &current->restart_block;
        restart->fn = futex_wait_restart;
        restart->futex.uaddr = uaddr;
        restart->futex.val = val;