projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21bc54f
)
vhost/test: fix after swiotlb changes
author
Michael S. Tsirkin
<mst@redhat.com>
Mon, 15 Aug 2016 01:28:12 +0000
(
04:28
+0300)
committer
Michael S. Tsirkin
<mst@redhat.com>
Mon, 15 Aug 2016 02:05:51 +0000
(
05:05
+0300)
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
drivers/vhost/test.c
patch
|
blob
|
history
diff --git
a/drivers/vhost/test.c
b/drivers/vhost/test.c
index
388eec4
..
97fb2f8
100644
(file)
--- 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;