Generic PTE range and remapping helpers now pass pointers to PTE table storage as hw_pte_t *. Update the callbacks to match those interfaces.
Keep logical PTE values as pte_t and continue to access them through the existing PTE helpers. Signed-off-by: Muhammad Usama Anjum <[email protected]> --- drivers/xen/gntdev.c | 2 +- drivers/xen/privcmd.c | 2 +- drivers/xen/xenbus/xenbus_client.c | 2 +- drivers/xen/xlate_mmu.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 1dcc4675580ed..b013bcad99b5b 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -301,7 +301,7 @@ void gntdev_put_map(struct gntdev_priv *priv, struct gntdev_grant_map *map) /* ------------------------------------------------------------------ */ -static int find_grant_ptes(pte_t *pte, unsigned long addr, void *data) +static int find_grant_ptes(hw_pte_t *pte, unsigned long addr, void *data) { struct gntdev_grant_map *map = data; unsigned int pgnr = (addr - map->pages_vm_start) >> PAGE_SHIFT; diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 725a49a0eee72..b4a487dcc9ecb 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -1658,7 +1658,7 @@ static int privcmd_mmap(struct file *file, struct vm_area_struct *vma) * on a per pfn/pte basis. Mapping calls that fail with ENOENT * can be then retried until success. */ -static int is_mapped_fn(pte_t *pte, unsigned long addr, void *data) +static int is_mapped_fn(hw_pte_t *pte, unsigned long addr, void *data) { return pte_none(ptep_get(pte)) ? 0 : -EBUSY; } diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c index 27682cb5e58ab..387f97a555594 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c @@ -749,7 +749,7 @@ int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr) EXPORT_SYMBOL_GPL(xenbus_unmap_ring_vfree); #ifdef CONFIG_XEN_PV -static int map_ring_apply(pte_t *pte, unsigned long addr, void *data) +static int map_ring_apply(hw_pte_t *pte, unsigned long addr, void *data) { struct map_ring_valloc *info = data; diff --git a/drivers/xen/xlate_mmu.c b/drivers/xen/xlate_mmu.c index 8efd7b55223fb..d7244f9f9a545 100644 --- a/drivers/xen/xlate_mmu.c +++ b/drivers/xen/xlate_mmu.c @@ -93,7 +93,7 @@ static void setup_hparams(unsigned long gfn, void *data) info->fgfn++; } -static int remap_pte_fn(pte_t *ptep, unsigned long addr, void *data) +static int remap_pte_fn(hw_pte_t *ptep, unsigned long addr, void *data) { struct remap_data *info = data; struct page *page = info->pages[info->index++]; @@ -269,7 +269,7 @@ struct remap_pfn { unsigned long i; }; -static int remap_pfn_fn(pte_t *ptep, unsigned long addr, void *data) +static int remap_pfn_fn(hw_pte_t *ptep, unsigned long addr, void *data) { struct remap_pfn *r = data; struct page *page = r->pages[r->i]; -- 2.47.3
