Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -2217,7 +2217,7 @@ retry:
|
||||
if (!abs_time)
|
||||
goto out;
|
||||
|
||||
restart = ¤t_thread_info()->restart_block;
|
||||
restart = ¤t->restart_block;
|
||||
restart->fn = futex_wait_restart;
|
||||
restart->futex.uaddr = uaddr;
|
||||
restart->futex.val = val;
|
||||
|
Reference in New Issue
Block a user