mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
xen/xenbus: client: Fix call of virt_to_mfn in xenbus_grant_ring
virt_to_mfn should take a void* rather an unsigned long. While it doesn't really matter now, it would throw a compiler warning later when virt_to_mfn will enforce the type. At the same time, avoid to compute new virtual address every time in the loop and directly increment the parameter as we don't use it later. Signed-off-by: Julien Grall <julien.grall@citrix.com> Reviewed-by: David Vrabel <david.vrabel@citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com>
This commit is contained in:
parent
a9fd60e268
commit
c9fd55eb66
1 changed files with 3 additions and 3 deletions
|
@ -379,16 +379,16 @@ int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
for (i = 0; i < nr_pages; i++) {
|
for (i = 0; i < nr_pages; i++) {
|
||||||
unsigned long addr = (unsigned long)vaddr +
|
|
||||||
(PAGE_SIZE * i);
|
|
||||||
err = gnttab_grant_foreign_access(dev->otherend_id,
|
err = gnttab_grant_foreign_access(dev->otherend_id,
|
||||||
virt_to_mfn(addr), 0);
|
virt_to_mfn(vaddr), 0);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
xenbus_dev_fatal(dev, err,
|
xenbus_dev_fatal(dev, err,
|
||||||
"granting access to ring page");
|
"granting access to ring page");
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
grefs[i] = err;
|
grefs[i] = err;
|
||||||
|
|
||||||
|
vaddr = vaddr + PAGE_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue