From 3ca58597bacae1539f30bebbf3edc9471c1fb4cf Mon Sep 17 00:00:00 2001
From: Peter Oruba <peter.oruba@amd.com>
Date: Wed, 24 Sep 2008 11:50:35 +0200
Subject: [PATCH] --- yaml --- r: 113343 b: refs/heads/master c:
 82b078659ed04e1ecdebf8326e189cf76ed361af h: refs/heads/master i:   113341:
 6453681c2941b05ae398f39e031bae02a4a225ce   113339:
 0197163e093a93340bfdf0e7bb6e9310ada53c9b   113335:
 d00196cc3d91e496ab3cff89eeb1d15a8ad3fa90   113327:
 a66d7221ceca543d986c683139fc4f6290fa45ad   113311:
 9be5fcac0b70874267ad29afffbf7021533c4c0d   113279:
 ca08df12c6c69d9bf5764faf5c989f873f2786ab v: v3

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

diff --git a/[refs] b/[refs]
index 5842f5d95e25..dc4cd924a23f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f9284e4e3be7b0b4d8d0638f9805603069a762d
+refs/heads/master: 82b078659ed04e1ecdebf8326e189cf76ed361af
diff --git a/trunk/arch/x86/kernel/microcode_core.c b/trunk/arch/x86/kernel/microcode_core.c
index ff031dbccdf6..8db2eb55e9e2 100644
--- a/trunk/arch/x86/kernel/microcode_core.c
+++ b/trunk/arch/x86/kernel/microcode_core.c
@@ -450,7 +450,7 @@ static int __init microcode_init(void)
 
 	if (c->x86_vendor == X86_VENDOR_INTEL)
 		microcode_ops = init_intel_microcode();
-	else if (c->x86_vendor != X86_VENDOR_AMD)
+	else if (c->x86_vendor == X86_VENDOR_AMD)
 		microcode_ops = init_amd_microcode();
 
 	if (!microcode_ops) {