diff options
| author |   Wolfram Sang <wsa@kernel.org> | 2022-09-16 20:42:18 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2022-09-16 20:42:18 +0100 |
| commit | d819524d3144f4703f45f473fdc85ad7579ae94c (patch) | |
| tree | 9bcb29b9b1a24ecf5a1a367c1af7d9be138ba041 /drivers/char | |
| parent | i2c: rk3x: Add rv1126 support (diff) | |
| parent | Linux 6.0-rc5 (diff) | |
| download | wireguard-linux-d819524d3144f4703f45f473fdc85ad7579ae94c.tar.xz wireguard-linux-d819524d3144f4703f45f473fdc85ad7579ae94c.zip | |
Merge tag 'v6.0-rc5' into i2c/for-mergewindow
Linux 6.0-rc5
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/mem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 84ca98ed1dad..32a932a065a6 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -480,6 +480,11 @@ static ssize_t splice_write_null(struct pipe_inode_info *pipe, struct file *out, return splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_null); } +static int uring_cmd_null(struct io_uring_cmd *ioucmd, unsigned int issue_flags) +{ + return 0; +} + static ssize_t read_iter_zero(struct kiocb *iocb, struct iov_iter *iter) { size_t written = 0; @@ -663,6 +668,7 @@ static const struct file_operations null_fops = { .read_iter = read_iter_null, .write_iter = write_iter_null, .splice_write = splice_write_null, + .uring_cmd = uring_cmd_null, }; static const struct file_operations __maybe_unused port_fops = { |