3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/xen/gntalloc.c b/drivers/xen/gntalloc.c
index 4547a91bca67..7a47c4c9fb1b 100644
--- a/drivers/xen/gntalloc.c
+++ b/drivers/xen/gntalloc.c
@@ -504,7 +504,7 @@ static int gntalloc_mmap(struct file *filp, struct vm_area_struct *vma)
         struct gntalloc_file_private_data *priv = filp->private_data;
         struct gntalloc_vma_private_data *vm_priv;
         struct gntalloc_gref *gref;
-        int count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+        int count = vma_pages(vma);
         int rv, i;
 
         if (!(vma->vm_flags & VM_SHARED)) {
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 67939578cd6d..bb952121ea94 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -982,7 +982,7 @@ static int gntdev_mmap(struct file *flip, struct vm_area_struct *vma)
 {
         struct gntdev_priv *priv = flip->private_data;
         int index = vma->vm_pgoff;
-        int count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+        int count = vma_pages(vma);
         struct grant_map *map;
         int i, err = -EINVAL;
 
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index df2e6f783318..702040fe2001 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -582,7 +582,7 @@ static long privcmd_ioctl(struct file *file,
 static void privcmd_close(struct vm_area_struct *vma)
 {
         struct page **pages = vma->vm_private_data;
-        int numpgs = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+        int numpgs = vma_pages(vma);
         int numgfns = (vma->vm_end - vma->vm_start) >> XEN_PAGE_SHIFT;
         int rc;