From 9d7ed1f478b1e79e91286d8a5b6933f8d839828b Mon Sep 17 00:00:00 2001
From: Fenghua Yu <fenghua.yu@intel.com>
Date: Thu, 20 Dec 2012 23:44:32 -0800
Subject: [PATCH] --- yaml --- r: 356277 b: refs/heads/master c:
 da76f64e7eb28b718501d15c1b79af560b7ca4ea h: refs/heads/master i:   356275:
 77c87c7725fbb004875da876c7e4f0750634f93a v: v3

---
 [refs]                 |  2 +-
 trunk/arch/x86/Kconfig | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d192fb4d06f..be8783f75430 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd745be89e1580e8a1b47454a39f97f9c5c4b1e0
+refs/heads/master: da76f64e7eb28b718501d15c1b79af560b7ca4ea
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 79795af59810..e243da7a2f96 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -1029,6 +1029,24 @@ config MICROCODE_OLD_INTERFACE
 	def_bool y
 	depends on MICROCODE
 
+config MICROCODE_INTEL_LIB
+	def_bool y
+	depends on MICROCODE_INTEL
+
+config MICROCODE_INTEL_EARLY
+	bool "Early load microcode"
+	depends on MICROCODE_INTEL && BLK_DEV_INITRD
+	default y
+	help
+	  This option provides functionality to read additional microcode data
+	  at the beginning of initrd image. The data tells kernel to load
+	  microcode to CPU's as early as possible. No functional change if no
+	  microcode data is glued to the initrd, therefore it's safe to say Y.
+
+config MICROCODE_EARLY
+	def_bool y
+	depends on MICROCODE_INTEL_EARLY
+
 config X86_MSR
 	tristate "/dev/cpu/*/msr - Model-specific register support"
 	---help---