diff --git a/[refs] b/[refs]
index cbbffae0ee92..d29f6d6c46af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 636a31781684d0f49208aa163f1a5a3a74210eb4
+refs/heads/master: 8343ef2437c599d30568e6b5a257a40bf2f4902b
diff --git a/trunk/arch/x86/kernel/microcode_amd.c b/trunk/arch/x86/kernel/microcode_amd.c
index 33b2a217a8c5..a6e76ccf8158 100644
--- a/trunk/arch/x86/kernel/microcode_amd.c
+++ b/trunk/arch/x86/kernel/microcode_amd.c
@@ -500,13 +500,15 @@ static struct microcode_ops microcode_amd_ops = {
 
 static int __init microcode_amd_module_init(void)
 {
-	struct cpuinfo_x86 *c = &cpu_data(get_cpu());
+	struct cpuinfo_x86 *c = &cpu_data(0);
 
 	equiv_cpu_table = NULL;
-	if (c->x86_vendor == X86_VENDOR_AMD)
-		return microcode_init(&microcode_amd_ops, THIS_MODULE);
-	else
+	if (c->x86_vendor != X86_VENDOR_AMD) {
+		printk(KERN_ERR "microcode: CPU platform is not AMD-capable\n");
 		return -ENODEV;
+	}
+
+	return microcode_init(&microcode_amd_ops, THIS_MODULE);
 }
 
 static void __exit microcode_amd_module_exit(void)
diff --git a/trunk/arch/x86/kernel/microcode_intel.c b/trunk/arch/x86/kernel/microcode_intel.c
index d2d9d74f4cbb..6dd8907ff22e 100644
--- a/trunk/arch/x86/kernel/microcode_intel.c
+++ b/trunk/arch/x86/kernel/microcode_intel.c
@@ -531,12 +531,14 @@ static struct microcode_ops microcode_intel_ops = {
 
 static int __init microcode_intel_module_init(void)
 {
-	struct cpuinfo_x86 *c = &cpu_data(get_cpu());
+	struct cpuinfo_x86 *c = &cpu_data(0);
 
-	if (c->x86_vendor == X86_VENDOR_INTEL)
-		return microcode_init(&microcode_intel_ops, THIS_MODULE);
-	else
+	if (c->x86_vendor != X86_VENDOR_INTEL) {
+                printk(KERN_ERR "microcode: CPU platform is not Intel-capable\n");
 		return -ENODEV;
+	}
+
+	return microcode_init(&microcode_intel_ops, THIS_MODULE);
 }
 
 static void __exit microcode_intel_module_exit(void)