From cb5ef20c75c7a11c7d1d2471fad5e3e3050327b4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 16 Oct 2012 17:19:15 +0100 Subject: [PATCH] --- yaml --- r: 343432 b: refs/heads/master c: 7892f6928d0cd9ef9200a193183c2033b3143dab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/xen/mmu.c | 2 +- trunk/include/xen/xen-ops.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index abc91b956ef9..01142abeb5b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c61ba7291b81ed7fd8c1dba1b45d05cae3f150f7 +refs/heads/master: 7892f6928d0cd9ef9200a193183c2033b3143dab diff --git a/trunk/arch/x86/xen/mmu.c b/trunk/arch/x86/xen/mmu.c index 0f6386a5b437..fd8393f55069 100644 --- a/trunk/arch/x86/xen/mmu.c +++ b/trunk/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/trunk/include/xen/xen-ops.h b/trunk/include/xen/xen-ops.h index 990b43e441e6..a50e7bee8912 100644 --- a/trunk/include/xen/xen-ops.h +++ b/trunk/include/xen/xen-ops.h @@ -2,6 +2,7 @@ #define INCLUDE_XEN_OPS_H #include +#include 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,