summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-12-12 10:13:41 -0800
committerDmitry Shmidt <dimitrysh@google.com>2016-12-12 10:13:41 -0800
commit8a2ec431d5987e1d93c13208da1dcd0e430114ae (patch)
treef637129753cfb35421fce566fcbb42f98540a8d7 /include/linux
parent97b84c96505aa2b9c8772bbae68a4fa93da8c0f4 (diff)
parentc95b7f1fab0c76882764a5196119237c8ad436ee (diff)
Merge tag 'v4.4.38' into android-4.4.y
This is the 4.4.38 stable release
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/uio.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 5f9c59da978b..e2225109b816 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -101,12 +101,12 @@ int iov_iter_npages(const struct iov_iter *i, int maxpages);
const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags);
-static inline size_t iov_iter_count(struct iov_iter *i)
+static inline size_t iov_iter_count(const struct iov_iter *i)
{
return i->count;
}
-static inline bool iter_is_iovec(struct iov_iter *i)
+static inline bool iter_is_iovec(const struct iov_iter *i)
{
return !(i->type & (ITER_BVEC | ITER_KVEC));
}