define __poll_t, annotate constants

Al Viro committed 9 years ago

Commit 8ced3901 parent d759be88 files · +32 −26Browse files

Unified · Split

8 files

arch/blackfin/include/uapi/asm/poll.h +2 −2
arch/frv/include/uapi/asm/poll.h +1 −1
arch/m68k/include/uapi/asm/poll.h +1 −1
arch/mips/include/uapi/asm/poll.h +1 −1
arch/sparc/include/uapi/asm/poll.h +4 −4
arch/xtensa/include/uapi/asm/poll.h +2 −2
include/uapi/asm-generic/poll.h +15 −15
include/uapi/linux/types.h +6 −0

arch/blackfin/include/uapi/asm/poll.h+2−2

@@ -9,8 +9,8 @@ · 8 unmodified lines
9	9	#ifndef _UAPI__BFIN_POLL_H
10	10	#define _UAPI__BFIN_POLL_H
11	11
12		−#define POLLWRNORM 4 /* POLLOUT */
13		−#define POLLWRBAND 256
	12	+#define POLLWRNORM (__force __poll_t)4 /* POLLOUT */
	13	+#define POLLWRBAND (__force __poll_t)256
14	14
15	15	#include <asm-generic/poll.h>
16	16

arch/frv/include/uapi/asm/poll.h+1−1

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	3	#define _ASM_POLL_H
4	4
5	5	#define POLLWRNORM POLLOUT
6		−#define POLLWRBAND 256
	6	+#define POLLWRBAND (__force __poll_t)256
7	7
8	8	#include <asm-generic/poll.h>
9	9

arch/m68k/include/uapi/asm/poll.h+1−1

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	3	#define __m68k_POLL_H
4	4
5	5	#define POLLWRNORM POLLOUT
6		−#define POLLWRBAND 256
	6	+#define POLLWRBAND (__force __poll_t)256
7	7
8	8	#include <asm-generic/poll.h>
9	9

arch/mips/include/uapi/asm/poll.h+1−1

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	3	#define __ASM_POLL_H
4	4
5	5	#define POLLWRNORM POLLOUT
6		−#define POLLWRBAND 0x0100
	6	+#define POLLWRBAND (__force __poll_t)0x0100
7	7
8	8	#include <asm-generic/poll.h>
9	9

arch/sparc/include/uapi/asm/poll.h+4−4

@@ -3,10 +3,10 @@ · 2 unmodified lines
3	3	#define __SPARC_POLL_H
4	4
5	5	#define POLLWRNORM POLLOUT
6		−#define POLLWRBAND 256
7		−#define POLLMSG 512
8		−#define POLLREMOVE 1024
9		−#define POLLRDHUP 2048
	6	+#define POLLWRBAND (__force __poll_t)256
	7	+#define POLLMSG (__force __poll_t)512
	8	+#define POLLREMOVE (__force __poll_t)1024
	9	+#define POLLRDHUP (__force __poll_t)2048
10	10
11	11	#include <asm-generic/poll.h>
12	12

arch/xtensa/include/uapi/asm/poll.h+2−2

@@ -13,8 +13,8 @@ · 12 unmodified lines
13	13	#define _XTENSA_POLL_H
14	14
15	15	#define POLLWRNORM POLLOUT
16		−#define POLLWRBAND 0x0100
17		−#define POLLREMOVE 0x0800
	16	+#define POLLWRBAND (__force __poll_t)0x0100
	17	+#define POLLREMOVE (__force __poll_t)0x0800
18	18
19	19	#include <asm-generic/poll.h>
20	20

include/uapi/asm-generic/poll.h+15−15

@@ -3,35 +3,35 @@ · 2 unmodified lines
3	3	#define __ASM_GENERIC_POLL_H
4	4
5	5	/* These are specified by iBCS2 */
6		−#define POLLIN 0x0001
7		−#define POLLPRI 0x0002
8		−#define POLLOUT 0x0004
9		−#define POLLERR 0x0008
10		−#define POLLHUP 0x0010
11		−#define POLLNVAL 0x0020
	6	+#define POLLIN (__force __poll_t)0x0001
	7	+#define POLLPRI (__force __poll_t)0x0002
	8	+#define POLLOUT (__force __poll_t)0x0004
	9	+#define POLLERR (__force __poll_t)0x0008
	10	+#define POLLHUP (__force __poll_t)0x0010
	11	+#define POLLNVAL (__force __poll_t)0x0020
12	12
13	13	/* The rest seem to be more-or-less nonstandard. Check them! */
14		−#define POLLRDNORM 0x0040
15		−#define POLLRDBAND 0x0080
	14	+#define POLLRDNORM (__force __poll_t)0x0040
	15	+#define POLLRDBAND (__force __poll_t)0x0080
16	16	#ifndef POLLWRNORM
17		−#define POLLWRNORM 0x0100
	17	+#define POLLWRNORM (__force __poll_t)0x0100
18	18	#endif
19	19	#ifndef POLLWRBAND
20		−#define POLLWRBAND 0x0200
	20	+#define POLLWRBAND (__force __poll_t)0x0200
21	21	#endif
22	22	#ifndef POLLMSG
23		−#define POLLMSG 0x0400
	23	+#define POLLMSG (__force __poll_t)0x0400
24	24	#endif
25	25	#ifndef POLLREMOVE
26		−#define POLLREMOVE 0x1000
	26	+#define POLLREMOVE (__force __poll_t)0x1000
27	27	#endif
28	28	#ifndef POLLRDHUP
29		−#define POLLRDHUP 0x2000
	29	+#define POLLRDHUP (__force __poll_t)0x2000
30	30	#endif
31	31
32		−#define POLLFREE 0x4000 /* currently only for epoll */
	32	+#define POLLFREE (__force __poll_t)0x4000 /* currently only for epoll */
33	33
34		−#define POLL_BUSY_LOOP 0x8000
	34	+#define POLL_BUSY_LOOP (__force __poll_t)0x8000
35	35
36	36	struct pollfd {
37	37	int fd;

include/uapi/linux/types.h+6−0

@@ -49,5 +49,11 @@ typedef __u32 __bitwise __wsum; · 48 unmodified lines
49	49	#define __aligned_be64 __be64 __attribute__((aligned(8)))
50	50	#define __aligned_le64 __le64 __attribute__((aligned(8)))
51	51
	52	+#ifdef __CHECK_POLL
	53	+typedef unsigned __bitwise __poll_t;
	54	+#else
	55	+typedef unsigned __poll_t;
	56	+#endif
	57	+
52	58	#endif /* __ASSEMBLY__ */
53	59	#endif /* _UAPI_LINUX_TYPES_H */