diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-16 15:51:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-16 15:51:57 -0700 |
| commit | 3ec60b92d3bae719cf3a8b6e522af07ad3d1cc5b (patch) | |
| tree | 194b96f2d90235f8511a125dfe29d8d3d9eed55c /drivers | |
| parent | 45b6ae761e5259d457a797f66f4d4c16b620f268 (diff) | |
| parent | 6be3ffaa0e15c64f560904b025f5c50bef5886f9 (diff) | |
| download | linux-3ec60b92d3bae719cf3a8b6e522af07ad3d1cc5b.tar.bz2 | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost fixes from Michael Tsirkin:
- test fixes
- a vsock fix
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
tools/virtio: add dma stubs
vhost/test: fix after swiotlb changes
vhost/vsock: drop space available check for TX vq
ringtest: test build fix
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vhost/test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c index 388eec4e1a90..97fb2f8fa930 100644 --- a/drivers/vhost/test.c +++ b/drivers/vhost/test.c @@ -220,20 +220,20 @@ static long vhost_test_reset_owner(struct vhost_test *n) { void *priv = NULL; long err; - struct vhost_memory *memory; + struct vhost_umem *umem; mutex_lock(&n->dev.mutex); err = vhost_dev_check_owner(&n->dev); if (err) goto done; - memory = vhost_dev_reset_owner_prepare(); - if (!memory) { + umem = vhost_dev_reset_owner_prepare(); + if (!umem) { err = -ENOMEM; goto done; } vhost_test_stop(n, &priv); vhost_test_flush(n); - vhost_dev_reset_owner(&n->dev, memory); + vhost_dev_reset_owner(&n->dev, umem); done: mutex_unlock(&n->dev.mutex); return err; |