Merge branch 'arm-privcmd-for-3.8' of git://xenbits.xen.org/people/ianc/linux into...

* '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>

diff --cc drivers/xen/Makefile
Simple merge

diff --cc include/xen/xen-ops.h
index 6170abd53d0bf1b8aa0612a46dc929aa1284a21e,a50e7bee891203e52cf489763327face535d8d30..d6fe062cad6b3128b25104107a1c0468d442295f
--- 1/include/xen/xen-ops.h
--- 2/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 */