preparation to switching ->poll() to returning EPOLL...

"Linux Kernel Mailing List" <[email protected]> Sun, 11 Feb 2018 23:11:10 +0000 (UTC)
Newsgroups gmane.linux.kernel.commits.head
Message-ID <[email protected]>
Web:        https://git.kernel.org/torvalds/c/e78cd95bebd94ede71285722f5bf2464bfa4c599
Commit:     e78cd95bebd94ede71285722f5bf2464bfa4c599
Parent:     65aaf87b3aa2d049c6b9fd85221858a895df3393
Refname:    refs/heads/master
Author:     Al Viro <[email protected]>
AuthorDate: Thu Feb 1 11:01:35 2018 -0500
Committer:  Al Viro <[email protected]>
CommitDate: Thu Feb 1 16:29:29 2018 -0500

    preparation to switching ->poll() to returning EPOLL...
    
    Signed-off-by: Al Viro <[email protected]>
---
 include/linux/poll.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/linux/poll.h b/include/linux/poll.h
index 04781a753326..d23104b32931 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -11,6 +11,7 @@
 #include <linux/sysctl.h>
 #include <linux/uaccess.h>
 #include <uapi/linux/poll.h>
+#include <uapi/linux/eventpoll.h>
 
 extern struct ctl_table epoll_table[]; /* for sysctl */
 /* ~832 bytes of stack space used max in sys_select/sys_poll before allocating
@@ -22,7 +23,7 @@ extern struct ctl_table epoll_table[]; /* for sysctl */
 #define WQUEUES_STACK_ALLOC	(MAX_STACK_ALLOC - FRONTEND_STACK_ALLOC)
 #define N_INLINE_POLL_ENTRIES	(WQUEUES_STACK_ALLOC / sizeof(struct poll_table_entry))
 
-#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
+#define DEFAULT_POLLMASK (EPOLLIN | EPOLLOUT | EPOLLRDNORM | EPOLLWRNORM)
 
 struct poll_table_struct;
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html