From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 04:34:25 +0000 (+1100)
Subject: Merge remote-tracking branch 'xen/upstream/xen'
X-Git-Tag: next-20111221~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=19bdaf0899c0ea7932d485c4e48240af4d44a25d;p=karo-tx-linux.git

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

Conflicts:
	arch/x86/xen/Kconfig
---

19bdaf0899c0ea7932d485c4e48240af4d44a25d
diff --cc arch/x86/include/asm/microcode.h
index 4ebe157bf73d,22677d67dffb..d7fb7e0c8cc8
--- a/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/xen/Kconfig
index 26c731a106af,4d04d4f1acfb..7cbcbd19b3d3
--- a/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