]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.8-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Dec 2016 09:31:39 +0000 (10:31 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Dec 2016 09:31:39 +0000 (10:31 +0100)
added patches:
constify-iov_iter_count-and-iter_is_iovec.patch

queue-4.8/constify-iov_iter_count-and-iter_is_iovec.patch [new file with mode: 0644]
queue-4.8/series

diff --git a/queue-4.8/constify-iov_iter_count-and-iter_is_iovec.patch b/queue-4.8/constify-iov_iter_count-and-iter_is_iovec.patch
new file mode 100644 (file)
index 0000000..a4c50ef
--- /dev/null
@@ -0,0 +1,36 @@
+From b57332b4105abf1d518d93886e547ee2f98cd414 Mon Sep 17 00:00:00 2001
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Mon, 10 Oct 2016 13:57:37 -0400
+Subject: constify iov_iter_count() and iter_is_iovec()
+
+From: Al Viro <viro@zeniv.linux.org.uk>
+
+commit b57332b4105abf1d518d93886e547ee2f98cd414 upstream.
+
+[stable note, need this to prevent build warning in commit
+a0ac402cfcdc904f9772e1762b3fda112dcc56a0]
+
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/uio.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/linux/uio.h
++++ b/include/linux/uio.h
+@@ -102,12 +102,12 @@ int iov_iter_npages(const struct iov_ite
+ 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));
+ }
index 58ad3d5f5b8b3693f607113adac4d50c006e4e6a..011091005d9f8d095ff4765fb7bc302b313c7331 100644 (file)
@@ -36,3 +36,4 @@ sparc64-fix-find_node-warning-if-numa-node-cannot-be-found.patch
 sparc64-fix-compile-warning-section-mismatch-in-find_node.patch
 sparc32-fix-inverted-invalid_frame_pointer-checks-on-sigreturns.patch
 don-t-feed-anything-but-regular-iovec-s-to-blk_rq_map_user_iov.patch
+constify-iov_iter_count-and-iter_is_iovec.patch