summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-07-14 11:35:46 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2014-07-14 11:35:46 +1000
commit3264131892c0fc346a24675f1f577abe58e0d669 (patch)
tree45e9d249f14ceced7d2e16da1ca7c65fae1c92fa /include
parent123c0b9e560a6a9a91c1175659184bee8bdaed5d (diff)
parentcd67b9ac44ea1359c652785d162856404a1584ae (diff)
Merge remote-tracking branch 'vfs/for-next'
Diffstat (limited to 'include')
-rw-r--r--include/linux/uio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 09a7cffc224e..48d64e6ab292 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -84,7 +84,7 @@ unsigned long iov_iter_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);
ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages,
- size_t maxsize, size_t *start);
+ unsigned maxpages, size_t *start);
ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages,
size_t maxsize, size_t *start);
int iov_iter_npages(const struct iov_iter *i, int maxpages);