From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Dec 2011 03:41:58 +0000 (+1100)
Subject: Merge remote-tracking branch 'xen/upstream/xen'
X-Git-Tag: next-20111209~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c379d6182f26225cae4e3ba0a0212570b9646e3;p=karo-tx-linux.git

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

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

7c379d6182f26225cae4e3ba0a0212570b9646e3
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