diff options
Diffstat (limited to 'drivers/char/mem.c')
| -rw-r--r-- | drivers/char/mem.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 66719f9d294c..1fa9fa157c12 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/crash_dump.h> | 27 | #include <linux/crash_dump.h> |
| 28 | #include <linux/backing-dev.h> | 28 | #include <linux/backing-dev.h> |
| 29 | #include <linux/bootmem.h> | 29 | #include <linux/bootmem.h> |
| 30 | #include <linux/pipe_fs_i.h> | ||
| 30 | 31 | ||
| 31 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 32 | #include <asm/io.h> | 33 | #include <asm/io.h> |
| @@ -578,6 +579,18 @@ static ssize_t write_null(struct file * file, const char __user * buf, | |||
| 578 | return count; | 579 | return count; |
| 579 | } | 580 | } |
| 580 | 581 | ||
| 582 | static int pipe_to_null(struct pipe_inode_info *info, struct pipe_buffer *buf, | ||
| 583 | struct splice_desc *sd) | ||
| 584 | { | ||
| 585 | return sd->len; | ||
| 586 | } | ||
| 587 | |||
| 588 | static ssize_t splice_write_null(struct pipe_inode_info *pipe,struct file *out, | ||
| 589 | loff_t *ppos, size_t len, unsigned int flags) | ||
| 590 | { | ||
| 591 | return splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_null); | ||
| 592 | } | ||
| 593 | |||
| 581 | #ifdef CONFIG_MMU | 594 | #ifdef CONFIG_MMU |
| 582 | /* | 595 | /* |
| 583 | * For fun, we are using the MMU for this. | 596 | * For fun, we are using the MMU for this. |
| @@ -785,6 +798,7 @@ static struct file_operations null_fops = { | |||
| 785 | .llseek = null_lseek, | 798 | .llseek = null_lseek, |
| 786 | .read = read_null, | 799 | .read = read_null, |
| 787 | .write = write_null, | 800 | .write = write_null, |
| 801 | .splice_write = splice_write_null, | ||
| 788 | }; | 802 | }; |
| 789 | 803 | ||
| 790 | #if defined(CONFIG_ISA) || !defined(__mc68000__) | 804 | #if defined(CONFIG_ISA) || !defined(__mc68000__) |
