Merge branch 'iter-ubuf.2' into for-next
* iter-ubuf.2:
iov_iter: Mark copy_compat_iovec_from_user() noinline
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 783ae46..f3477c3 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1258,7 +1258,7 @@ const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags)
}
EXPORT_SYMBOL(dup_iter);
-static int copy_compat_iovec_from_user(struct iovec *iov,
+static __noclone int copy_compat_iovec_from_user(struct iovec *iov,
const struct iovec __user *uvec, unsigned long nr_segs)
{
const struct compat_iovec __user *uiov =
