summaryrefslogtreecommitdiffstats
path: root/include/xen/xen-ops.h
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-11-30 17:07:59 -0500
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-11-30 17:07:59 -0500
commit6a7ed405114b2a53ccd99631b0636aaeabf71b3e (patch)
treef8bb0dcddc66c59843433e2283f6bea57cc8ce24 /include/xen/xen-ops.h
parenta7be94ac8d69c037d08f0fd94b45a593f1d45176 (diff)
parentf832da068b0aadb15f747f6427b6bf945f525ba4 (diff)
downloadop-kernel-dev-6a7ed405114b2a53ccd99631b0636aaeabf71b3e.zip
op-kernel-dev-6a7ed405114b2a53ccd99631b0636aaeabf71b3e.tar.gz
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 <konrad.wilk@oracle.com>
Diffstat (limited to 'include/xen/xen-ops.h')
-rw-r--r--include/xen/xen-ops.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 6170abd..d6fe062 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,8 +27,11 @@ 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,
- 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 */
OpenPOWER on IntegriCloud