diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-23 13:07:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-23 13:07:04 -0700 |
| commit | d1a343a0231ea34db16ab6773809f2874bcabcf8 (patch) | |
| tree | fde1ec1fe66563bbbc92fc0c30b822d90e375896 /net/9p | |
| parent | b681268cb25f6242ea56efe6ea4b6467a92e2bac (diff) | |
| parent | c9ce42f72fd0ba180fd35539829e4139dca31494 (diff) | |
| download | linux-d1a343a0231ea34db16ab6773809f2874bcabcf8.tar.gz linux-d1a343a0231ea34db16ab6773809f2874bcabcf8.tar.bz2 linux-d1a343a0231ea34db16ab6773809f2874bcabcf8.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost fixes from Michael Tsirkin:
"Bugfixes and documentation fixes.
Igor's patch that allows users to tweak memory table size is
borderline, but it does fix known crashes, so I merged it"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vhost: add max_mem_regions module parameter
vhost: extend memory regions allocation to vmalloc
9p/trans_virtio: reset virtio device on remove
virtio/s390: rename drivers/s390/kvm -> drivers/s390/virtio
MAINTAINERS: separate section for s390 virtio drivers
virtio: define virtio_pci_cfg_cap in header.
virtio: Fix typecast of pointer in vring_init()
virtio scsi: fix unused variable warning
vhost: use binary search instead of linear in find_region()
virtio_net: document VIRTIO_NET_CTRL_GUEST_OFFLOADS
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/trans_virtio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 9dd49ca67dbc..6e70ddb158b4 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -704,6 +704,7 @@ static void p9_virtio_remove(struct virtio_device *vdev) mutex_unlock(&virtio_9p_lock); + vdev->config->reset(vdev); vdev->config->del_vqs(vdev); sysfs_remove_file(&(vdev->dev.kobj), &dev_attr_mount_tag.attr); |