From d7f25bf0424473016dcb5659ff74f055fedc631f Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@linux.intel.com>
Date: Thu, 26 Jan 2012 00:09:13 +0100
Subject: [PATCH] --- yaml --- r: 288855 b: refs/heads/master c:
 78ff123b05fb15beb1ad670372eea0d299d0b8af h: refs/heads/master i:   288853:
 407618acd453d4f77560c849ed8534df0a27387e   288851:
 ff1824e0e230884c7e268b7d24571b05c9b441d2   288847:
 283d281c291f944a1c5dda743002ea6336669d25 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/kernel/microcode_core.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6348b71dfd05..b56bbb7f221c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa8031aefec0cf7ea6c2387c93610d99d9659aa2
+refs/heads/master: 78ff123b05fb15beb1ad670372eea0d299d0b8af
diff --git a/trunk/arch/x86/kernel/microcode_core.c b/trunk/arch/x86/kernel/microcode_core.c
index fda91c307104..87a0f8688301 100644
--- a/trunk/arch/x86/kernel/microcode_core.c
+++ b/trunk/arch/x86/kernel/microcode_core.c
@@ -86,6 +86,7 @@
 
 #include <asm/microcode.h>
 #include <asm/processor.h>
+#include <asm/cpu_device_id.h>
 
 MODULE_DESCRIPTION("Microcode Update Driver");
 MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
@@ -504,6 +505,20 @@ static struct notifier_block __refdata mc_cpu_notifier = {
 	.notifier_call	= mc_cpu_callback,
 };
 
+#ifdef MODULE
+/* Autoload on Intel and AMD systems */
+static const struct x86_cpu_id microcode_id[] = {
+#ifdef CONFIG_MICROCODE_INTEL
+	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, },
+#endif
+#ifdef CONFIG_MICROCODE_AMD
+	{ X86_VENDOR_AMD, X86_FAMILY_ANY, X86_MODEL_ANY, },
+#endif
+	{}
+};
+MODULE_DEVICE_TABLE(x86cpu, microcode_id);
+#endif
+
 static int __init microcode_init(void)
 {
 	struct cpuinfo_x86 *c = &cpu_data(0);