[3.16.y-ckt stable] Patch "virtio_console: init work unconditionally" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Mon Mar 30 13:00:04 UTC 2015

This is a note to let you know that I have just added a patch titled

    virtio_console: init work unconditionally

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:


This patch is scheduled to be released in version 3.16.7-ckt10.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see



>From d4cef9b9c4aea3566f4d796105b1c829b10d6ec0 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst at redhat.com>
Date: Thu, 5 Mar 2015 10:45:30 +1030
Subject: virtio_console: init work unconditionally

commit 4f6e24ed9de8634d6471ef86b382cba6d4e57ca8 upstream.

when multiport is off, we don't initialize config work,
but we then cancel uninitialized control_work on freeze.

Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
Reviewed-by: Amit Shah <amit.shah at redhat.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
 drivers/char/virtio_console.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 60aafb8a1f2e..5f6dce6c20fb 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -2024,12 +2024,13 @@ static int virtcons_probe(struct virtio_device *vdev)

+	INIT_WORK(&portdev->control_work, &control_work_handler);
 	if (multiport) {
 		unsigned int nr_added_bufs;

-		INIT_WORK(&portdev->control_work, &control_work_handler);

 		nr_added_bufs = fill_queue(portdev->c_ivq,

More information about the kernel-team mailing list