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

[karo-tx-linux.git] / kernel / futex.c

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