8 files changed, 32 insertions, 26 deletions

diff --git a/arch/blackfin/include/uapi/asm/poll.h b/arch/blackfin/include/uapi/asm/poll.h
index 8b094d43e9b7..961e49056b0a 100644
--- a/arch/blackfin/include/uapi/asm/poll.h
+++ b/arch/blackfin/include/uapi/asm/poll.h
@@ -9,8 +9,8 @@
 #ifndef _UAPI__BFIN_POLL_H
 #define _UAPI__BFIN_POLL_H
 
-#define POLLWRNORM      4 /* POLLOUT */
-#define POLLWRBAND      256
+#define POLLWRNORM      (__force __poll_t)4 /* POLLOUT */
+#define POLLWRBAND      (__force __poll_t)256
 
 #include <asm-generic/poll.h>
 
diff --git a/arch/frv/include/uapi/asm/poll.h b/arch/frv/include/uapi/asm/poll.h
index 887b67288340..d7053ada7c69 100644
--- a/arch/frv/include/uapi/asm/poll.h
+++ b/arch/frv/include/uapi/asm/poll.h
@@ -3,7 +3,7 @@
 #define _ASM_POLL_H
 
 #define POLLWRNORM      POLLOUT
-#define POLLWRBAND      256
+#define POLLWRBAND      (__force __poll_t)256
 
 #include <asm-generic/poll.h>
 
diff --git a/arch/m68k/include/uapi/asm/poll.h b/arch/m68k/include/uapi/asm/poll.h
index c3e3fcc15e1d..99314937fe5c 100644
--- a/arch/m68k/include/uapi/asm/poll.h
+++ b/arch/m68k/include/uapi/asm/poll.h
@@ -3,7 +3,7 @@
 #define __m68k_POLL_H
 
 #define POLLWRNORM      POLLOUT
-#define POLLWRBAND      256
+#define POLLWRBAND      (__force __poll_t)256
 
 #include <asm-generic/poll.h>
 
diff --git a/arch/mips/include/uapi/asm/poll.h b/arch/mips/include/uapi/asm/poll.h
index ad289d7b7434..e937f8b1b007 100644
--- a/arch/mips/include/uapi/asm/poll.h
+++ b/arch/mips/include/uapi/asm/poll.h
@@ -3,7 +3,7 @@
 #define __ASM_POLL_H
 
 #define POLLWRNORM      POLLOUT
-#define POLLWRBAND      0x0100
+#define POLLWRBAND      (__force __poll_t)0x0100
 
 #include <asm-generic/poll.h>
 
diff --git a/arch/sparc/include/uapi/asm/poll.h b/arch/sparc/include/uapi/asm/poll.h
index 72356c999125..595cb12df1f1 100644
--- a/arch/sparc/include/uapi/asm/poll.h
+++ b/arch/sparc/include/uapi/asm/poll.h
@@ -3,10 +3,10 @@
 #define __SPARC_POLL_H
 
 #define POLLWRNORM      POLLOUT
-#define POLLWRBAND      256
-#define POLLMSG         512
-#define POLLREMOVE      1024
-#define POLLRDHUP       2048
+#define POLLWRBAND      (__force __poll_t)256
+#define POLLMSG         (__force __poll_t)512
+#define POLLREMOVE      (__force __poll_t)1024
+#define POLLRDHUP       (__force __poll_t)2048
 
 #include <asm-generic/poll.h>
 
diff --git a/arch/xtensa/include/uapi/asm/poll.h b/arch/xtensa/include/uapi/asm/poll.h
index 4d249040b33d..22bbc48b9f85 100644
--- a/arch/xtensa/include/uapi/asm/poll.h
+++ b/arch/xtensa/include/uapi/asm/poll.h
@@ -13,8 +13,8 @@
 #define _XTENSA_POLL_H
 
 #define POLLWRNORM      POLLOUT
-#define POLLWRBAND      0x0100
-#define POLLREMOVE      0x0800
+#define POLLWRBAND      (__force __poll_t)0x0100
+#define POLLREMOVE      (__force __poll_t)0x0800
 
 #include <asm-generic/poll.h>
 
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 */