define __poll_t, annotate constants

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 21 insertions, 15 deletions

diff --git a/include/uapi/asm-generic/poll.h b/include/uapi/asm-generic/poll.h
index fefb3d2c3fac..8c0e9dd384b6 100644
--- a/include/uapi/asm-generic/poll.h
+++ b/include/uapi/asm-generic/poll.h
@@ -3,35 +3,35 @@
 #define __ASM_GENERIC_POLL_H
 
 /* These are specified by iBCS2 */
-#define POLLIN          0x0001
-#define POLLPRI         0x0002
-#define POLLOUT         0x0004
-#define POLLERR         0x0008
-#define POLLHUP         0x0010
-#define POLLNVAL        0x0020
+#define POLLIN          (__force __poll_t)0x0001
+#define POLLPRI         (__force __poll_t)0x0002
+#define POLLOUT         (__force __poll_t)0x0004
+#define POLLERR         (__force __poll_t)0x0008
+#define POLLHUP         (__force __poll_t)0x0010
+#define POLLNVAL        (__force __poll_t)0x0020
 
 /* The rest seem to be more-or-less nonstandard. Check them! */
-#define POLLRDNORM      0x0040
-#define POLLRDBAND      0x0080
+#define POLLRDNORM      (__force __poll_t)0x0040
+#define POLLRDBAND      (__force __poll_t)0x0080
 #ifndef POLLWRNORM
-#define POLLWRNORM      0x0100
+#define POLLWRNORM      (__force __poll_t)0x0100
 #endif
 #ifndef POLLWRBAND
-#define POLLWRBAND      0x0200
+#define POLLWRBAND      (__force __poll_t)0x0200
 #endif
 #ifndef POLLMSG
-#define POLLMSG         0x0400
+#define POLLMSG         (__force __poll_t)0x0400
 #endif
 #ifndef POLLREMOVE
-#define POLLREMOVE      0x1000
+#define POLLREMOVE      (__force __poll_t)0x1000
 #endif
 #ifndef POLLRDHUP
-#define POLLRDHUP       0x2000
+#define POLLRDHUP       (__force __poll_t)0x2000
 #endif
 
-#define POLLFREE        0x4000  /* currently only for epoll */
+#define POLLFREE        (__force __poll_t)0x4000        /* currently only for epoll */
 
-#define POLL_BUSY_LOOP  0x8000
+#define POLL_BUSY_LOOP  (__force __poll_t)0x8000
 
 struct pollfd {
         int fd;
diff --git a/include/uapi/linux/types.h b/include/uapi/linux/types.h
index e3d1d0c78f3c..cd4f0b897a48 100644
--- a/include/uapi/linux/types.h
+++ b/include/uapi/linux/types.h
@@ -49,5 +49,11 @@ typedef __u32 __bitwise __wsum;
 #define __aligned_be64 __be64 __attribute__((aligned(8)))
 #define __aligned_le64 __le64 __attribute__((aligned(8)))
 
+#ifdef __CHECK_POLL
+typedef unsigned __bitwise __poll_t;
+#else
+typedef unsigned __poll_t;
+#endif
+
 #endif /*  __ASSEMBLY__ */
 #endif /* _UAPI_LINUX_TYPES_H */