Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index 1f6d646eee4a..2579e407ff67 100644
--- 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;