diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-04 23:57:07 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-03-21 09:19:32 +0100 |
| commit | 1d4748e942d5e85579015c36ed9fe1b7bf346183 (patch) | |
| tree | 5d7500c1a4c4c0f193a6f0d56d34d1be874854a8 /backport | |
| parent | 446eed8b9a7666d67bcbe5daf3cc5993408bc305 (diff) | |
backport: poll.h: add include linux/eventpoll.h
The POLL constants are getting replaced with the EPOLL constants. In
this process commit e78cd95bebd9 ("preparation to switching ->poll() to
returning EPOLL...") added an additional include to linux/poll.h. Some
drivers make use of this indirect include now and fail to compile
without it.
Older kernel versions do not define all the EPON constants so add them
if they are not available.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport')
| -rw-r--r-- | backport/backport-include/linux/eventpoll.h | 49 | ||||
| -rw-r--r-- | backport/backport-include/linux/poll.h | 1 |
2 files changed, 50 insertions, 0 deletions
diff --git a/backport/backport-include/linux/eventpoll.h b/backport/backport-include/linux/eventpoll.h new file mode 100644 index 00000000..7cc87aa0 --- /dev/null +++ b/backport/backport-include/linux/eventpoll.h @@ -0,0 +1,49 @@ +#ifndef __BACKPORT_LINUX_EVENTPOLL_H +#define __BACKPORT_LINUX_EVENTPOLL_H +#include_next <linux/eventpoll.h> + +#ifndef EPOLLIN +#define EPOLLIN 0x00000001 +#endif + +#ifndef EPOLLPRI +#define EPOLLPRI 0x00000002 +#endif + +#ifndef EPOLLOUT +#define EPOLLOUT 0x00000004 +#endif + +#ifndef EPOLLERR +#define EPOLLERR 0x00000008 +#endif + +#ifndef EPOLLHUP +#define EPOLLHUP 0x00000010 +#endif + +#ifndef EPOLLRDNORM +#define EPOLLRDNORM 0x00000040 +#endif + +#ifndef EPOLLRDBAND +#define EPOLLRDBAND 0x00000080 +#endif + +#ifndef EPOLLWRNORM +#define EPOLLWRNORM 0x00000100 +#endif + +#ifndef EPOLLWRBAND +#define EPOLLWRBAND 0x00000200 +#endif + +#ifndef EPOLLMSG +#define EPOLLMSG 0x00000400 +#endif + +#ifndef EPOLLRDHUP +#define EPOLLRDHUP 0x00002000 +#endif + +#endif /* __BACKPORT_LINUX_EVENTPOLL_H */ diff --git a/backport/backport-include/linux/poll.h b/backport/backport-include/linux/poll.h index 3eecd81f..aea64048 100644 --- a/backport/backport-include/linux/poll.h +++ b/backport/backport-include/linux/poll.h @@ -2,6 +2,7 @@ #define __BACKPORT_LINUX_POLL_H #include_next <linux/poll.h> #include <linux/version.h> +#include <linux/eventpoll.h> #if LINUX_VERSION_IS_LESS(3,4,0) #define poll_does_not_wait LINUX_BACKPORT(poll_does_not_wait) |