aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/microcode/amd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index 9fb398e64b0a..4cbfe70cf458 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -56,7 +56,6 @@ static struct cont_desc {
56 56
57static u32 ucode_new_rev; 57static u32 ucode_new_rev;
58static u8 amd_ucode_patch[PATCH_MAX_SIZE]; 58static u8 amd_ucode_patch[PATCH_MAX_SIZE];
59static u16 this_equiv_id;
60 59
61/* 60/*
62 * Microcode patch container file is prepended to the initrd in cpio 61 * Microcode patch container file is prepended to the initrd in cpio
@@ -228,8 +227,6 @@ apply_microcode_early_amd(u32 cpuid_1_eax, void *ucode, size_t size,
228 if (!desc.eq_id) 227 if (!desc.eq_id)
229 return ret; 228 return ret;
230 229
231 this_equiv_id = desc.eq_id;
232
233 mc = desc.mc; 230 mc = desc.mc;
234 if (!mc) 231 if (!mc)
235 return ret; 232 return ret;
@@ -375,7 +372,7 @@ reget:
375 if (!eq_id) 372 if (!eq_id)
376 return; 373 return;
377 374
378 if (eq_id == this_equiv_id) { 375 if (eq_id == cont.eq_id) {
379 mc = (struct microcode_amd *)amd_ucode_patch; 376 mc = (struct microcode_amd *)amd_ucode_patch;
380 377
381 if (mc && rev < mc->hdr.patch_id) { 378 if (mc && rev < mc->hdr.patch_id) {