diff options
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/intel.c')
-rw-r--r-- | arch/x86/kernel/cpu/microcode/intel.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 3f329b74e040..8325d8a09ab0 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c | |||
@@ -41,7 +41,7 @@ | |||
41 | 41 | ||
42 | static const char ucode_path[] = "kernel/x86/microcode/GenuineIntel.bin"; | 42 | static const char ucode_path[] = "kernel/x86/microcode/GenuineIntel.bin"; |
43 | 43 | ||
44 | /* Current microcode patch used in early patching */ | 44 | /* Current microcode patch used in early patching on the APs. */ |
45 | struct microcode_intel *intel_ucode_patch; | 45 | struct microcode_intel *intel_ucode_patch; |
46 | 46 | ||
47 | static inline bool cpu_signatures_match(unsigned int s1, unsigned int p1, | 47 | static inline bool cpu_signatures_match(unsigned int s1, unsigned int p1, |
@@ -607,12 +607,6 @@ int __init save_microcode_in_initrd_intel(void) | |||
607 | struct ucode_cpu_info uci; | 607 | struct ucode_cpu_info uci; |
608 | struct cpio_data cp; | 608 | struct cpio_data cp; |
609 | 609 | ||
610 | /* | ||
611 | * AP loading didn't find any microcode patch, no need to save anything. | ||
612 | */ | ||
613 | if (!intel_ucode_patch || IS_ERR(intel_ucode_patch)) | ||
614 | return 0; | ||
615 | |||
616 | if (!load_builtin_intel_microcode(&cp)) | 610 | if (!load_builtin_intel_microcode(&cp)) |
617 | cp = find_microcode_in_initrd(ucode_path, false); | 611 | cp = find_microcode_in_initrd(ucode_path, false); |
618 | 612 | ||
@@ -628,7 +622,6 @@ int __init save_microcode_in_initrd_intel(void) | |||
628 | return 0; | 622 | return 0; |
629 | } | 623 | } |
630 | 624 | ||
631 | |||
632 | /* | 625 | /* |
633 | * @res_patch, output: a pointer to the patch we found. | 626 | * @res_patch, output: a pointer to the patch we found. |
634 | */ | 627 | */ |