Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio bugfix from Michael S Tsirkin:
"This fixes a crash in virtio console multi-channel mode that got
introduced in -rc1"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio_console: move early VQ enablement
+2
-2
+2
-2
drivers/char/virtio_console.c
+2
-2
drivers/char/virtio_console.c
···
1449
1449
spin_lock_init(&port->outvq_lock);
1450
1450
init_waitqueue_head(&port->waitqueue);
1451
1451
1452
-
virtio_device_ready(portdev->vdev);
1453
-
1454
1452
/* Fill the in_vq with buffers so the host can send us data. */
1455
1453
nr_added_bufs = fill_queue(port->in_vq, &port->inbuf_lock);
1456
1454
if (!nr_added_bufs) {
···
2023
2025
2024
2026
spin_lock_init(&portdev->ports_lock);
2025
2027
INIT_LIST_HEAD(&portdev->ports);
2028
+
2029
+
virtio_device_ready(portdev->vdev);
2026
2030
2027
2031
if (multiport) {
2028
2032
unsigned int nr_added_bufs;