diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-11-05 10:25:17 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-11-05 10:25:17 +0200 |
| commit | 5f8f965287494d55e8ba3551e3727a5e9d0eb702 (patch) | |
| tree | 22a814cce4bf9de25a2af9af704da77787ac1e14 /include/linux/splice.h | |
| parent | ba8a5cb234ba3bf0a585fd38e5f36d7e7ce33661 (diff) | |
| parent | e047c7be173caab95f3876ab30c03ebcf654c300 (diff) | |
Merge drm/drm-next into drm-intel-next-queued
Catch up with v5.10-rc2 and drm-misc-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/splice.h')
| -rw-r--r-- | include/linux/splice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/splice.h b/include/linux/splice.h index 5c47013f708e..a55179fd60fc 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -78,8 +78,8 @@ extern ssize_t add_to_pipe(struct pipe_inode_info *, struct pipe_buffer *); extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *, splice_direct_actor *); -extern long do_splice(struct file *in, loff_t __user *off_in, - struct file *out, loff_t __user *off_out, +extern long do_splice(struct file *in, loff_t *off_in, + struct file *out, loff_t *off_out, size_t len, unsigned int flags); extern long do_tee(struct file *in, struct file *out, size_t len, |