Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / drivers / char / virtio_console.c

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 5da47e26a0124262734357853eb8290d6e817712..d433b1db1fdd79469ae7b744cf8f2514c3a0fab0 100644 (file)
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -38,7 +38,6 @@
 #include <linux/workqueue.h>
 #include <linux/module.h>
 #include <linux/dma-mapping.h>
-#include <linux/kconfig.h>
 #include "../tty/hvc/hvc_console.h"
 
 #define is_rproc_enabled IS_ENABLED(CONFIG_REMOTEPROC)
@@ -889,7 +888,7 @@ static int pipe_to_sg(struct pipe_inode_info *pipe, struct pipe_buffer *buf,
                return 0;
 
        /* Try lock this page */
-       if (buf->ops->steal(pipe, buf) == 0) {
+       if (pipe_buf_steal(pipe, buf) == 0) {
                /* Get reference and unlock page for moving */
                get_page(buf->page);
                unlock_page(buf->page);