arm64: configs: add some devfreq gov for rk3399 linux

[firefly-linux-kernel-4.4.55.git] / drivers / char / mem.c

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 297110c12635d3b8c36b53a7f089aa2666024eca..6b1721f978c2945f4af716636c8373fe8807dca0 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -26,7 +26,7 @@
 #include <linux/pfn.h>
 #include <linux/export.h>
 #include <linux/io.h>
-#include <linux/aio.h>
+#include <linux/uio.h>
 
 #include <linux/uaccess.h>
 
@@ -607,16 +607,16 @@ static ssize_t write_null(struct file *file, const char __user *buf,
        return count;
 }
 
-static ssize_t aio_read_null(struct kiocb *iocb, const struct iovec *iov,
-                            unsigned long nr_segs, loff_t pos)
+static ssize_t read_iter_null(struct kiocb *iocb, struct iov_iter *to)
 {
        return 0;
 }
 
-static ssize_t aio_write_null(struct kiocb *iocb, const struct iovec *iov,
-                             unsigned long nr_segs, loff_t pos)
+static ssize_t write_iter_null(struct kiocb *iocb, struct iov_iter *from)
 {
-       return iov_length(iov, nr_segs);
+       size_t count = iov_iter_count(from);
+       iov_iter_advance(from, count);
+       return count;
 }
 
 static int pipe_to_null(struct pipe_inode_info *info, struct pipe_buffer *buf,
@@ -718,7 +718,7 @@ static int open_port(struct inode *inode, struct file *filp)
 #define zero_lseek     null_lseek
 #define full_lseek      null_lseek
 #define write_zero     write_null
-#define aio_write_zero aio_write_null
+#define write_iter_zero        write_iter_null
 #define open_mem       open_port
 #define open_kmem      open_mem
 
@@ -750,8 +750,8 @@ static const struct file_operations null_fops = {
        .llseek         = null_lseek,
        .read           = read_null,
        .write          = write_null,
-       .aio_read       = aio_read_null,
-       .aio_write      = aio_write_null,
+       .read_iter      = read_iter_null,
+       .write_iter     = write_iter_null,
        .splice_write   = splice_write_null,
 };
 
@@ -764,10 +764,9 @@ static const struct file_operations __maybe_unused port_fops = {
 
 static const struct file_operations zero_fops = {
        .llseek         = zero_lseek,
-       .read           = new_sync_read,
        .write          = write_zero,
        .read_iter      = read_iter_zero,
-       .aio_write      = aio_write_zero,
+       .write_iter     = write_iter_zero,
        .mmap           = mmap_zero,
 #ifndef CONFIG_MMU
        .mmap_capabilities = zero_mmap_capabilities,
@@ -776,7 +775,6 @@ static const struct file_operations zero_fops = {
 
 static const struct file_operations full_fops = {
        .llseek         = full_lseek,
-       .read           = new_sync_read,
        .read_iter      = read_iter_zero,
        .write          = write_full,
 };