Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / fs / select.c

diff --git a/fs/select.c b/fs/select.c
index 467bb1cb3ea5e0da46d7d4b305b1d7fb2c143208..f684c750e08a549283733c1340420a61733b4b61 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -971,7 +971,7 @@ SYSCALL_DEFINE3(poll, struct pollfd __user *, ufds, unsigned int, nfds,
        if (ret == -EINTR) {
                struct restart_block *restart_block;
 
-               restart_block = &current_thread_info()->restart_block;
+               restart_block = &current->restart_block;
                restart_block->fn = do_restart_poll;
                restart_block->poll.ufds = ufds;
                restart_block->poll.nfds = nfds;