]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
xen: correctly use xen_pfn_t in remap_domain_mfn_range.
authorIan Campbell <ian.campbell@citrix.com>
Tue, 16 Oct 2012 16:19:15 +0000 (17:19 +0100)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 5 Dec 2012 17:34:08 +0000 (12:34 -0500)
For Xen on ARM a PFN is 64 bits so we need to use the appropriate
type here.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
[v2: include the necessary header,
Reported-by: Fengguang Wu <fengguang.wu@intel.com> ]
arch/x86/xen/mmu.c
include/xen/xen-ops.h

index c9e99574f04bfeda5f0022fa6e79c2e3505d3eac..048fc1e98701a049133d874796ec8f52e10ebdf4 100644 (file)
@@ -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)
 
index 746702da3006db7a1a262f17ea64ca1b9d7986d5..2903303b579df77edda5836bcc0de26342f55b39 100644 (file)
@@ -2,6 +2,7 @@
 #define INCLUDE_XEN_OPS_H
 
 #include <linux/percpu.h>
+#include <asm/xen/interface.h>
 
 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,