summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2012-10-16 17:19:15 +0100
committerIan Campbell <ian.campbell@citrix.com>2012-11-29 12:59:19 +0000
commit7892f6928d0cd9ef9200a193183c2033b3143dab (patch)
tree080a7193b70d86ad14e2f1d72291e0f502463ad0
parentc61ba7291b81ed7fd8c1dba1b45d05cae3f150f7 (diff)
downloadop-kernel-dev-7892f6928d0cd9ef9200a193183c2033b3143dab.zip
op-kernel-dev-7892f6928d0cd9ef9200a193183c2033b3143dab.tar.gz
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 <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> ]
-rw-r--r--arch/x86/xen/mmu.c2
-rw-r--r--include/xen/xen-ops.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 0f6386a..fd8393f 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -2478,7 +2478,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 990b43e..a50e7be 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -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);
@@ -26,7 +27,7 @@ void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order);
struct vm_area_struct;
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,
OpenPOWER on IntegriCloud