Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes

[~andy/linux] / include / linux / splice.h

diff --git a/include/linux/splice.h b/include/linux/splice.h
index 74575cbf2d6f579c317fec5f1f16e9d3793fab03..0e43906d2fda6dc68cffc6343594178465d6e461 100644 (file)
--- a/include/linux/splice.h
+++ b/include/linux/splice.h
@@ -24,7 +24,8 @@
  * Passed to the actors
  */
 struct splice_desc {
-       unsigned int len, total_len;    /* current and remaining length */
+       size_t total_len;               /* remaining length */
+       unsigned int len;               /* current length */
        unsigned int flags;             /* splice flags */
        /*
         * actor() private data