X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Flinux%2Fthread_info.h;h=a8cc4e13434c4261ae8ab536566b23fcd777286a;hb=9a1607071c293e48b08bd703733480b1d55c7b93;hp=38a56477f27ada34c3cd6e56c912205b066bc413;hpb=f3de272b821accbc8387211977c2de4f38468d05;p=safe%2Fjmp%2Flinux-2.6 diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 38a5647..a8cc4e1 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -21,13 +21,14 @@ struct restart_block { struct { unsigned long arg0, arg1, arg2, arg3; }; - /* For futex_wait */ + /* For futex_wait and futex_wait_requeue_pi */ struct { u32 *uaddr; u32 val; u32 flags; u32 bitset; u64 time; + u32 *uaddr2; } futex; /* For nanosleep */ struct { @@ -38,6 +39,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; }; };