From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 28 Nov 2012 19:43:13 +0000 (-0500)
Subject: Merge branch 'stable/for-linus-3.8' into linux-next
X-Git-Tag: next-20121205~35^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=25cba9a9a48b0c3912461155dae88831471a89dd;p=karo-tx-linux.git

Merge branch 'stable/for-linus-3.8' into linux-next

* stable/for-linus-3.8:
  xen/acpi: Move the xen_running_on_version_or_later function.
  xen/xenbus: Remove duplicate inclusion of asm/xen/hypervisor.h
  xen/acpi: Fix compile error by missing decleration for xen_domain.
  xen/acpi: revert pad config check in xen_check_mwait
  xen/acpi: ACPI PAD driver
  xen-pciback: reject out of range inputs
  xen-pciback: simplify and tighten parsing of device IDs
  xen PVonHVM: use E820_Reserved area for shared_info

Conflicts:
	arch/x86/xen/enlighten.c
---

25cba9a9a48b0c3912461155dae88831471a89dd
diff --cc include/xen/xen-ops.h
index a50e7bee8912,6170abd53d0b..d6fe062cad6b
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@@ -27,10 -26,8 +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 */