Linux v3.18-rc4-184-gb23dc5a7cc6e

1 files changed, 0 insertions, 46 deletions

diff --git a/virtio_console-move-early-VQ-enablement.patch b/virtio_console-move-early-VQ-enablement.patch
deleted file mode 100644
index 8825504b6..000000000
--- a/virtio_console-move-early-VQ-enablement.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Cornelia Huck <cornelia.huck@de.ibm.com>
-Date: Mon, 20 Oct 2014 15:58:49 +0200
-Subject: [PATCH] virtio_console: move early VQ enablement
-
-Commit f5866db6 (virtio_console: enable VQs early) tried to make
-sure that DRIVER_OK was set when virtio_console started using its
-virtqueues. Doing this in add_port(), however, means that we try
-to set DRIVER_OK again when when a port is dynamically added after
-the probe function is done.
-
-Let's move virtio_device_ready() to the probe function just before
-trying to use the virtqueues instead. This is fine as nothing can
-fail inbetween.
-
-Reported-by: Thomas Graf <tgraf@suug.ch>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
----
- drivers/char/virtio_console.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
-index bfa640023e64..cf7a561fad7c 100644
---- a/drivers/char/virtio_console.c
-+++ b/drivers/char/virtio_console.c
-@@ -1449,8 +1449,6 @@ static int add_port(struct ports_device *portdev, u32 id)
- 	spin_lock_init(&port->outvq_lock);
- 	init_waitqueue_head(&port->waitqueue);
- 
--	virtio_device_ready(portdev->vdev);
--
- 	/* Fill the in_vq with buffers so the host can send us data. */
- 	nr_added_bufs = fill_queue(port->in_vq, &port->inbuf_lock);
- 	if (!nr_added_bufs) {
-@@ -2026,6 +2024,8 @@ static int virtcons_probe(struct virtio_device *vdev)
- 	spin_lock_init(&portdev->ports_lock);
- 	INIT_LIST_HEAD(&portdev->ports);
- 
-+	virtio_device_ready(portdev->vdev);
-+
- 	if (multiport) {
- 		unsigned int nr_added_bufs;
- 
--- 
-1.9.3
-