Merge branch 'stable/not-upstreamed' into uek2-merge

* stable/not-upstreamed:
  Revert "xen/mce: Add mcelog support for Xen platform"
  Revert "xen/mce: Register native mce handler as vMCE bounce back point"

Conflicts:
	drivers/xen/Kconfig
	drivers/xen/Makefile

diff --cc arch/x86/include/asm/xen/hypercall.h
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/xen/Kconfig
index 93bf303b243c38d0f942fabe1b57742e4bcd63ed,a59638b37c1add565887e30feba7aebc7c3b54be..06c41457843a4564d1e18128b665b8eac29decba
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -143,64 -105,4 +143,56 @@@ config SWIOTLB_XE
        depends on PCI
        select SWIOTLB
  
- config XEN_MCE_LOG
-       bool "Xen platform mcelog"
-       depends on XEN_DOM0 && X86_64 && X86_MCE
-       default n
-       help
-         Allow kernel fetching MCE error from Xen platform and
-         converting it into Linux mcelog format for mcelog tools
 +
 +config XEN_PRIVCMD
 +      tristate
 +      depends on XEN
 +      default m
 +
 +config XEN_TMEM
 +      bool
 +      default y if (CLEANCACHE || FRONTSWAP)
 +      help
 +        Shim to interface in-kernel Transcendent Memory hooks
 +        (e.g. cleancache and frontswap) to Xen tmem hypercalls.
 +
 +config XEN_PCIDEV_BACKEND
 +      tristate "Xen PCI-device backend driver"
 +      depends on PCI && X86 && XEN
 +      depends on XEN_BACKEND
 +      default m
 +      help
 +        The PCI device backend driver allows the kernel to export arbitrary
 +        PCI devices to other guests. If you select this to be a module, you
 +        will need to make sure no other driver has bound to the device(s)
 +        you want to make visible to other guests.
 +
 +        The parameter "passthrough" allows you specify how you want the PCI
 +        devices to appear in the guest. You can choose the default (0) where
 +        PCI topology starts at 00.00.0, or (1) for passthrough if you want
 +        the PCI devices topology appear the same as in the host.
 +
 +        The "hide" parameter (only applicable if backend driver is compiled
 +        into the kernel) allows you to bind the PCI devices to this module
 +        from the default device drivers. The argument is the list of PCI BDFs:
 +        xen-pciback.hide=(03:00.0)(04:00.0)
 +
 +        If in doubt, say m.
 +config XEN_ACPI_PROCESSOR
 +      tristate "Xen ACPI processor"
 +      depends on XEN && X86 && ACPI_PROCESSOR && CPU_FREQ
 +      default m
 +      help
 +          This ACPI processor uploads Power Management information to the Xen
 +        hypervisor.
 +
 +        To do that the driver parses the Power Management data and uploads
 +        said information to the Xen hypervisor. Then the Xen hypervisor can
 +        select the proper Cx and Pxx states. It also registers itslef as the
 +        SMM so that other drivers (such as ACPI cpufreq scaling driver) will
 +        not load.
 +
 +          To compile this driver as a module, choose M here: the module will be
 +        called xen_acpi_processor  If you do not know what to choose, select
 +        M here. If the CPUFREQ drivers are built in, select Y here.
- 
  endmenu

diff --cc drivers/xen/Makefile
index 14e82cb0eaddb3cc0c23b3d202f7be6d48a35d8a,66d3033e59496644e89130a4c3ab9115c73e385d..0e0a00b2beb3aea1663a62a81c16b0142f2e58fb
--- 1/drivers/xen/Makefile
--- 2/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -14,14 -14,10 +14,13 @@@ obj-$(CONFIG_XEN_GNTDEV)           += xen-gntdev
  obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)     += xen-gntalloc.o
  obj-$(CONFIG_XENFS)                   += xenfs/
  obj-$(CONFIG_XEN_SYS_HYPERVISOR)      += sys-hypervisor.o
 -obj-$(CONFIG_XEN_PLATFORM_PCI)                += xen-platform-pci.o
 +obj-$(CONFIG_XEN_PVHVM)                       += platform-pci.o
 +obj-$(CONFIG_XEN_TMEM)                        += tmem.o
- obj-$(CONFIG_XEN_MCE_LOG)             += mcelog.o
  obj-$(CONFIG_SWIOTLB_XEN)             += swiotlb-xen.o
 -obj-$(CONFIG_XEN_DOM0)                        += pci.o
 -
 +obj-$(CONFIG_XEN_DOM0)                        += pci.o acpi.o
 +obj-$(CONFIG_XEN_PRIVCMD)             += xen-privcmd.o
 +obj-$(CONFIG_XEN_ACPI_PROCESSOR)      += xen-acpi-processor.o
 +obj-$(CONFIG_XEN_PCIDEV_BACKEND)      += xen-pciback/
  xen-evtchn-y                          := evtchn.o
  xen-gntdev-y                          := gntdev.o
  xen-gntalloc-y                                := gntalloc.o