From: Konrad Rzeszutek Wilk Date: Fri, 30 Nov 2012 22:07:59 +0000 (-0500) Subject: Merge branch 'arm-privcmd-for-3.8' of git://xenbits.xen.org/people/ianc/linux into... X-Git-Tag: MMI-PSA29.97-13-9~15053^2~20 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6a7ed405114b2a53ccd99631b0636aaeabf71b3e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'arm-privcmd-for-3.8' of git://xenbits.xen.org/people/ianc/linux into stable/for-linus-3.8 * 'arm-privcmd-for-3.8' of git://xenbits.xen.org/people/ianc/linux: xen: arm: implement remap interfaces needed for privcmd mappings. xen: correctly use xen_pfn_t in remap_domain_mfn_range. xen: arm: enable balloon driver xen: balloon: allow PVMMU interfaces to be compiled out xen: privcmd: support autotranslated physmap guests. xen: add pages parameter to xen_remap_domain_mfn_range Signed-off-by: Konrad Rzeszutek Wilk --- 6a7ed405114b2a53ccd99631b0636aaeabf71b3e diff --cc include/xen/xen-ops.h index 6170abd53d0b,a50e7bee8912..d6fe062cad6b --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@@ -26,8 -27,10 +27,11 @@@ void xen_destroy_contiguous_region(unsi struct vm_area_struct; int xen_remap_domain_mfn_range(struct vm_area_struct *vma, unsigned long addr, - unsigned long mfn, int nr, - pgprot_t prot, unsigned domid); + 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, + int numpgs, struct page **pages); +bool xen_running_on_version_or_later(unsigned int major, unsigned int minor); #endif /* INCLUDE_XEN_OPS_H */