diff options
| author | Al Viro | 2017-11-29 19:00:41 -0500 |
|---|---|---|
| committer | Al Viro | 2017-11-29 19:00:41 -0500 |
| commit | c71d227fc4133f949dae620ed5e3a250b43f2415 (patch) | |
| tree | ce12b907996c2acd37e9d86f4ba492b09a0ab0f8 /fs/select.c | |
| parent | 69112736e2f025ff3ba280cf81c36e25cf7cc59f (diff) | |
make kernel-side POLL... arch-independent
mangle/demangle on the way to/from userland
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/select.c')
| -rw-r--r-- | fs/select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/select.c b/fs/select.c index b2deeb215dbe..ec14171dd78a 100644 --- a/fs/select.c +++ b/fs/select.c @@ -817,7 +817,7 @@ static inline __poll_t do_pollfd(struct pollfd *pollfd, poll_table *pwait, mask = POLLNVAL; if (f.file) { /* userland u16 ->events contains POLL... bitmap */ - __poll_t filter = (__force __poll_t)pollfd->events | + __poll_t filter = demangle_poll(pollfd->events) | POLLERR | POLLHUP; mask = DEFAULT_POLLMASK; if (f.file->f_op->poll) { @@ -833,7 +833,7 @@ static inline __poll_t do_pollfd(struct pollfd *pollfd, poll_table *pwait, } } /* ... and so does ->revents */ - pollfd->revents = (__force u16)mask; + pollfd->revents = mangle_poll(mask); return mask; } |