Signed-off-by: Ian Campbell <ian.campb...@citrix.com>
---
I beleive Mukesh has something similar in his tree. Should be trivial
to resolve I think. I'm happy to do so ontop of PVH v3 when it arrives.
---
arch/x86/xen/mmu.c | 6 ++----
drivers/xen/privcmd.c | 2 +-
include/xen/xen-ops.h | 3 ++-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 018cbf0..1c5812b 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -2655,11 +2655,9 @@ out:
EXPORT_SYMBOL_GPL(xen_remap_domain_mfn_range);
/* Returns: 0 success */
-int xen_unmap_domain_mfn_range(struct vm_area_struct *vma)
+int xen_unmap_domain_mfn_range(struct vm_area_struct *vma,
+ struct page **pages, int numpgs)
{
- int numpgs = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
- struct page **pages = vma ? vma->vm_private_data : NULL;
-
if (!pages || !xen_feature(XENFEAT_auto_translated_physmap))
return 0;
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 641a420..a1ca5ab 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -498,7 +498,7 @@ static void privcmd_close(struct vm_area_struct *vma)
if (!pages || !numpgs || !xen_feature(XENFEAT_auto_translated_physmap))
return;
- xen_unmap_domain_mfn_range(vma);
+ xen_unmap_domain_mfn_range(vma, pages, numpgs);
while (numpgs--)
free_xenballooned_pages(1, &pages[numpgs]);
kfree(pages);
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 8b24315..6a40253 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -29,6 +29,7 @@ int xen_remap_domain_mfn_range(struct vm_area_struct *vma,
unsigned long mfn, int nr,
pgprot_t prot, unsigned domid,
struct page **pages);
-int xen_unmap_domain_mfn_range(struct vm_area_struct *vma);
+int xen_unmap_domain_mfn_range(struct vm_area_struct *vma,
+ struct page **pages, int nr);
#endif /* INCLUDE_XEN_OPS_H */
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
