From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 11 May 2012 20:37:46 +0000 (-0400)
Subject: Merge branch 'stable/not-upstreamed' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~543^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=725c152c1dfd89bb1cf9ebd5f46aab9efcbb57ce;p=users%2Fjedix%2Flinux-maple.git

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

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

Conflicts:
	drivers/xen/Makefile
---

725c152c1dfd89bb1cf9ebd5f46aab9efcbb57ce
diff --cc arch/x86/xen/enlighten.c
index 67fc3ba8b23c,02b6818e3783..b3bc73a958f5
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -337,12 -246,9 +337,10 @@@ static void __init xen_init_cpuid_mask(
  
  	if (!xen_initial_domain())
  		cpuid_leaf1_edx_mask &=
- 			~((1 << X86_FEATURE_MCE)  |  /* disable MCE */
- 			  (1 << X86_FEATURE_MCA)  |  /* disable MCA */
- 			  (1 << X86_FEATURE_APIC) |  /* disable local APIC */
+ 			~((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 988653f86c82,d361172771c7..93bf303b243c
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@@ -146,62 -108,9 +146,61 @@@ config SWIOTLB_XE
  config XEN_MCE_LOG
  	bool "Xen platform mcelog"
  	depends on XEN_DOM0 && X86_64 && X86_MCE
- 	default y
+ 	default n
  	help
- 	  Allow kernel fetching mce log from xen platform and
- 	  converting it into linux mcelog format for mcelog tools
- 
+ 	  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 840467c0e6ee,3e95c110c563..14e82cb0eadd
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@ -14,14 -14,11 +14,14 @@@ 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_MCE_LOG)		+= mcelog.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