Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7892f692 authored Oct 16, 2012 by Ian Campbell

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> ]

parent c61ba729

arch/x86/xen/mmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

include/xen/xen-ops.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -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,