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

* stable/not-upstreamed:
  Xen: Export host physical CPU information to dom0
  xen/mce: Change the machine check point
  Add mcelog support from xen platform

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
index ebb8551c188bb4e710e31ebee22f51618f483af1,cfd1b8093163f807327ed991b2c97f2ed38d218a..75617367b3d441d31ff34b1b2b39fddd9993e867
--- 1/arch/x86/xen/enlighten.c
--- 2/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -336,10 -246,11 +334,12 @@@ static void __init xen_init_cpuid_mask(
  
        if (!xen_initial_domain())
                cpuid_leaf1_edx_mask &=
-                       ~((1 << X86_FEATURE_APIC) |  /* disable local APIC */
+                       ~((1 << X86_FEATURE_MCE)  |  /* disable MCE */
+                         (1 << X86_FEATURE_MCA)  |  /* disable MCA */
+                         (1 << X86_FEATURE_APIC) |  /* disable local APIC */
                          (1 << X86_FEATURE_ACPI));  /* disable ACPI */
        ax = 1;
 +      cx = 0;
        xen_cpuid(&ax, &bx, &cx, &dx);
  
        xsave_mask =

diff --cc drivers/xen/Kconfig
index 34b4010d8edde87f441499bcbcd061cb89263589,d4de506ae197f03bf835762a8323b53f2f68d221..73dced0107658e1546d4e2f4f1941473901a33c8
--- 1/drivers/xen/Kconfig
--- 2/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -143,53 -105,13 +143,62 @@@ 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 y
+       help
+         Allow kernel fetching mce log from xen platform and
+         converting it into linux mcelog format for mcelog tools
+ 
+ 
 +config XEN_PROCESSOR_PASSTHRU
 +      tristate "Processor passthrough driver for Xen"
 +      depends on XEN
 +      depends on ACPI_PROCESSOR
 +      depends on X86
 +      depends on CPU_FREQ
 +      help
 +        This driver parses the processor structure and passes the information
 +        to the Xen hypervisor. It is used to allow the Xen hypervisor to have the
 +        full power management data and be able to select proper Cx and Pxx states.
 +
 +        The driver should be loaded after acpi processor and cpufreq drivers have
 +        been loaded. If you do not know what to choose, select M here.
 +
 +
 +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.
  endmenu

diff --cc drivers/xen/Makefile
index e32d0326dbd6b201752e65a712d488a127fcf300,fc173f410ad2ff67bb305a97651f3adbab305668..2f3ba85a3c84c794018f575fcbb6edf95c6b523a
--- 1/drivers/xen/Makefile
--- 2/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -1,5 -1,6 +1,5 @@@
- obj-y += grant-table.o features.o events.o manage.o balloon.o
+ obj-y += grant-table.o features.o events.o manage.o balloon.o pcpu.o
  obj-y += xenbus/
 -obj-y += tmem.o
  
  nostackp := $(call cc-option, -fno-stack-protector)
  CFLAGS_features.o                     := $(nostackp)
@@@ -14,13 -14,11 +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_PVHVM)                       += platform-pci.o
+ obj-$(CONFIG_XEN_MCE_LOG)             += mcelog.o
 -obj-$(CONFIG_XEN_PLATFORM_PCI)                += xen-platform-pci.o
 +obj-$(CONFIG_XEN_TMEM)                        += tmem.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_PROCESSOR_PASSTHRU)  += processor-passthru.o
 +obj-$(CONFIG_XEN_PCIDEV_BACKEND)      += xen-pciback/
  xen-evtchn-y                          := evtchn.o
  xen-gntdev-y                          := gntdev.o
  xen-gntalloc-y                                := gntalloc.o

diff --cc include/xen/interface/platform.h
Simple merge

diff --cc include/xen/interface/xen.h
Simple merge