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.

diff --cc arch/x86/xen/Kconfig
index b55683df80036331823d8e68109342ebf83d2e5c,4d04d4f1acfbb96816761b1f698bd44df2eda2dd..fe40df97476e4d022d054d54e94a37a525d6f8f6
--- 1/arch/x86/xen/Kconfig
--- 2/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