Commit 8ced390c authored by Al Viro's avatar Al Viro

define __poll_t, annotate constants

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d759be89
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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;
......
......@@ -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 */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment