Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d567928 authored by Julien Grall's avatar Julien Grall Committed by David Vrabel
Browse files

xen/xenbus: Use Xen page definition 



All the ring (xenstore, and PV rings) are always based on the page
granularity of Xen.

Signed-off-by: default avatarJulien Grall <julien.grall@citrix.com>
Reviewed-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Reviewed-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 36f8abd3

drivers/xen/xenbus/xenbus_client.c

+3 −3
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr, 
		}

		grefs[i] = err;



		vaddr = vaddr + PAGE_SIZE;

		vaddr = vaddr + XEN_PAGE_SIZE;

	}



	return 0;
@@ -555,7 +555,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev, 
	if (!node)

		return -ENOMEM;



	area = alloc_vm_area(PAGE_SIZE * nr_grefs, ptes);

	area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, ptes);

	if (!area) {

		kfree(node);

		return -ENOMEM;
@@ -749,7 +749,7 @@ static int xenbus_unmap_ring_vfree_pv(struct xenbus_device *dev, void *vaddr) 
		unsigned long addr;



		memset(&unmap[i], 0, sizeof(unmap[i]));

		addr = (unsigned long)vaddr + (PAGE_SIZE * i);

		addr = (unsigned long)vaddr + (XEN_PAGE_SIZE * i);

		unmap[i].host_addr = arbitrary_virt_to_machine(

			lookup_address(addr, &level)).maddr;

		unmap[i].dev_bus_addr = 0;

drivers/xen/xenbus/xenbus_probe.c

+2 −1
Original line number Diff line number Diff line
@@ -802,7 +802,8 @@ static int __init xenbus_init(void) 
			goto out_error;

		xen_store_gfn = (unsigned long)v;

		xen_store_interface =

			xen_remap(xen_store_gfn << PAGE_SHIFT, PAGE_SIZE);

			xen_remap(xen_store_gfn << XEN_PAGE_SHIFT,

				  XEN_PAGE_SIZE);

		break;

	default:

		pr_warn("Xenstore state unknown\n");