Merge commit 'v2.6.28-rc2' into topic/asoc

1 files changed, 8 insertions, 0 deletions

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index 38a56477f27a..e6b820f8b56b 100644
--- a/include/linux/thread_info.h
+++ b/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;
         };
 };