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

Linus Torvalds committed 8 years ago

Commit a5b729e2 parents 9215310 11c5ad04 files · +15 −10Browse files

Showing the changes to include/uapi/linux (1 of 4 files). Show all

Unified · Split

include/uapi/linux/aio_abi.h+1−1

@@ -109,7 +109,7 @@ struct iocb { · 108 unmodified lines
109	#undef IFLITTLE	109	#undef IFLITTLE
110		110
111	struct __aio_sigset {	111	struct __aio_sigset {
112	sigset_t __user *sigmask;	112	const sigset_t __user *sigmask;
113	size_t sigsetsize;	113	size_t sigsetsize;
114	};	114	};
115		115