diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-03 02:49:46 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-03 02:49:46 +0300 |
| commit | df889b363198d946c0286b3fb2cfcca18d08a029 (patch) | |
| tree | 22846d29e33c6f01058d76b7aeccd64baa50731a /include/linux | |
| parent | ce8644fcadc52da72e19ae9f0866fb3eb15d3df4 (diff) | |
| parent | 10c64cea04d3c75c306b3f990586ffb343b63287 (diff) | |
| download | linux-df889b363198d946c0286b3fb2cfcca18d08a029.tar.xz | |
Merge branch 'for-linus' into work.lookups
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/uio.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h index fd9bcfedad42..1b5d1cd796e2 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -87,6 +87,7 @@ size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i); size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i); size_t iov_iter_zero(size_t bytes, struct iov_iter *); unsigned long iov_iter_alignment(const struct iov_iter *i); +unsigned long iov_iter_gap_alignment(const struct iov_iter *i); void iov_iter_init(struct iov_iter *i, int direction, const struct iovec *iov, unsigned long nr_segs, size_t count); void iov_iter_kvec(struct iov_iter *i, int direction, const struct kvec *kvec, |