diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 09:11:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 09:11:40 +0200 |
| commit | a5b729ea18ae601e7aea329e41052bbb861114bd (patch) | |
| tree | 5b4a1238fb005e1b48bea893c0827ebb4271c99c /include | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | eventpoll: switch to ->poll_mask (diff) | |
| download | linux-a5b729ea18ae601e7aea329e41052bbb861114bd.tar.xz linux-a5b729ea18ae601e7aea329e41052bbb861114bd.zip | |
Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull aio fixes from Al Viro:
"Assorted AIO followups and fixes"
* 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
eventpoll: switch to ->poll_mask
aio: only return events requested in poll_mask() for IOCB_CMD_POLL
eventfd: only return events requested in poll_mask()
aio: mark __aio_sigset::sigmask const
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/aio_abi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/aio_abi.h b/include/uapi/linux/aio_abi.h index 75846164290e..d00221345c19 100644 --- a/include/uapi/linux/aio_abi.h +++ b/include/uapi/linux/aio_abi.h @@ -109,7 +109,7 @@ struct iocb { #undef IFLITTLE struct __aio_sigset { - sigset_t __user *sigmask; + const sigset_t __user *sigmask; size_t sigsetsize; }; |