From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 24 Feb 2012 04:54:24 +0000 (-0500)
Subject: Merge branch 'stable/not-upstreamed' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~595^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f88c1e80c3e1e3a250a6ed5249987f987f7dd0c0;p=users%2Fjedix%2Flinux-maple.git

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

* stable/not-upstreamed:
  x86/microcode: check proper return code.
  xen: add CPU microcode update driver
  xen: add dom0_op hypercall
  xen/acpi: Domain0 acpi parser related platform hypercall

Conflicts:
	arch/x86/xen/Kconfig
	include/xen/interface/platform.h

Note: The approach in upstream is to get rid of the microcode
driver altogether and do at early bootup. Even as early as
syslinux/pxeboot or initial kernel image. But those patches
are not yet ready.
---

f88c1e80c3e1e3a250a6ed5249987f987f7dd0c0
diff --cc arch/x86/xen/Kconfig
index b55683df8003,4d04d4f1acfb..fe40df97476e
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@@ -52,7 -50,14 +52,11 @@@ config XEN_DEBUG_F
  	  Enable statistics output and various tuning options in debugfs.
  	  Enabling this option may incur a significant performance overhead.
  
 -config XEN_DEBUG
 -	bool "Enable Xen debug checks"
 -	depends on XEN
 -	default n
 -	help
 -	  Enable various WARN_ON checks in the Xen MMU code.
 -	  Enabling this option WILL incur a significant performance overhead.
  
+ config MICROCODE_XEN
+        def_bool y
+        depends on XEN_DOM0 && MICROCODE
++
 +config MICROCODE_XEN
 +       def_bool y
 +       depends on XEN_DOM0 && MICROCODE