diff --git a/[refs] b/[refs] index fdd49195d214..fd6a63dd01da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b773ad40aca5bd755ba886620842f16e8fef6d75 +refs/heads/master: be5dad20a55e054a35dac7f6f5f184dc72b379b4 diff --git a/trunk/include/linux/thread_info.h b/trunk/include/linux/thread_info.h index 38a56477f27a..e6b820f8b56b 100644 --- a/trunk/include/linux/thread_info.h +++ b/trunk/include/linux/thread_info.h @@ -38,6 +38,14 @@ struct restart_block { #endif u64 expires; } nanosleep; + /* For poll */ + struct { + struct pollfd __user *ufds; + int nfds; + int has_timeout; + unsigned long tv_sec; + unsigned long tv_nsec; + } poll; }; };