Skip to content

Commit 7892f69

Browse files
author
Ian Campbell
committed
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> ]
1 parent c61ba72 commit 7892f69

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

arch/x86/xen/mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2478,7 +2478,7 @@ static int remap_area_mfn_pte_fn(pte_t *ptep, pgtable_t token,
24782478

24792479
int xen_remap_domain_mfn_range(struct vm_area_struct *vma,
24802480
unsigned long addr,
2481-
unsigned long mfn, int nr,
2481+
xen_pfn_t mfn, int nr,
24822482
pgprot_t prot, unsigned domid,
24832483
struct page **pages)
24842484

include/xen/xen-ops.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define INCLUDE_XEN_OPS_H
33

44
#include <linux/percpu.h>
5+
#include <asm/xen/interface.h>
56

67
DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu);
78

@@ -26,7 +27,7 @@ void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order);
2627
struct vm_area_struct;
2728
int xen_remap_domain_mfn_range(struct vm_area_struct *vma,
2829
unsigned long addr,
29-
unsigned long mfn, int nr,
30+
xen_pfn_t mfn, int nr,
3031
pgprot_t prot, unsigned domid,
3132
struct page **pages);
3233
int xen_unmap_domain_mfn_range(struct vm_area_struct *vma,

0 commit comments

Comments
 (0)