From: Ian Campbell Date: Tue, 16 Oct 2012 16:19:15 +0000 (+0100) Subject: xen: correctly use xen_pfn_t in remap_domain_mfn_range. X-Git-Tag: v2.6.39-400.9.0~33^2^2~1^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b1d1ba8efded60c0ffb4f78c1c4e18b1ed2525d4;p=users%2Fjedix%2Flinux-maple.git xen: correctly use xen_pfn_t in remap_domain_mfn_range. For Xen on ARM a PFN is 64 bits so we need to use the appropriate type here. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk [v2: include the necessary header, Reported-by: Fengguang Wu ] --- diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index c9e99574f04b..048fc1e98701 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -2505,7 +2505,7 @@ static int remap_area_mfn_pte_fn(pte_t *ptep, pgtable_t token, int xen_remap_domain_mfn_range(struct vm_area_struct *vma, unsigned long addr, - unsigned long mfn, int nr, + xen_pfn_t mfn, int nr, pgprot_t prot, unsigned domid, struct page **pages) diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 746702da3006..2903303b579d 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -2,6 +2,7 @@ #define INCLUDE_XEN_OPS_H #include +#include DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu); @@ -25,7 +26,7 @@ void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order); int xen_remap_domain_mfn_range(struct vm_area_struct *vma, unsigned long addr, - unsigned long mfn, int nr, + xen_pfn_t mfn, int nr, pgprot_t prot, unsigned domid, struct page **pages); int xen_unmap_domain_mfn_range(struct vm_area_struct *vma,