Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
	arch/x86/xen/Kconfig

diff --cc arch/x86/include/asm/microcode.h
index 4ebe157bf73db184b4e73df8f391db399fd874a7,22677d67dffbe0a5fe15f34e9807545a4edbe5cf..d7fb7e0c8cc8dad52d180ce25c886531cbde435d
--- 1/arch/x86/include/asm/microcode.h
--- 2/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@@ -60,7 -59,15 +60,16 @@@ static inline struct microcode_ops * __
  {
        return NULL;
  }
 +static inline void __exit exit_amd_microcode(void) {}
  #endif
  
+ #ifdef CONFIG_MICROCODE_XEN
+ extern struct microcode_ops * __init init_xen_microcode(void);
+ #else
+ static inline struct microcode_ops * __init init_xen_microcode(void)
+ {
+       return NULL;
+ }
+ #endif
+ 
  #endif /* _ASM_X86_MICROCODE_H */

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/microcode_core.c
Simple merge

diff --cc arch/x86/xen/Kconfig
index 26c731a106afd11b8db6a37577a84b36a221aff0,4d04d4f1acfbb96816761b1f698bd44df2eda2dd..7cbcbd19b3d3cbe494b71342adc0e59951e2185d
--- 1/arch/x86/xen/Kconfig
--- 2/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@@ -48,3 -49,15 +48,7 @@@ config XEN_DEBUG_F
        help
          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