Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/microcode/intel: Remove unused @rev arg of get_matching_sig()

@rev wasn't used in get_matching_sig(), drop it.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Borislav Petkov and committed by
Ingo Molnar
da9b5076 a1a32d29

+5 -6
+1 -1
arch/x86/include/asm/microcode_intel.h
··· 58 58 59 59 extern int get_matching_microcode(unsigned int csig, int cpf, int rev, void *mc); 60 60 extern int microcode_sanity_check(void *mc, int print_err); 61 - extern int get_matching_sig(unsigned int csig, int cpf, int rev, void *mc); 61 + extern int get_matching_sig(unsigned int csig, int cpf, void *mc); 62 62 63 63 #ifdef CONFIG_MICROCODE_INTEL_EARLY 64 64 extern void __init load_ucode_intel_bsp(void);
+2 -3
arch/x86/kernel/cpu/microcode/intel_early.c
··· 246 246 u8 *ucode_ptr, unsigned int num_saved) 247 247 { 248 248 struct microcode_header_intel *mc_hdr, *mc_saved_hdr; 249 - unsigned int sig, pf, new_rev; 249 + unsigned int sig, pf; 250 250 int found = 0, i; 251 251 252 252 mc_hdr = (struct microcode_header_intel *)ucode_ptr; ··· 255 255 mc_saved_hdr = (struct microcode_header_intel *)mc_saved[i]; 256 256 sig = mc_saved_hdr->sig; 257 257 pf = mc_saved_hdr->pf; 258 - new_rev = mc_hdr->rev; 259 258 260 - if (!get_matching_sig(sig, pf, new_rev, ucode_ptr)) 259 + if (!get_matching_sig(sig, pf, ucode_ptr)) 261 260 continue; 262 261 263 262 found = 1;
+2 -2
arch/x86/kernel/cpu/microcode/intel_lib.c
··· 124 124 /* 125 125 * Returns 1 if update has been found, 0 otherwise. 126 126 */ 127 - int get_matching_sig(unsigned int csig, int cpf, int rev, void *mc) 127 + int get_matching_sig(unsigned int csig, int cpf, void *mc) 128 128 { 129 129 struct microcode_header_intel *mc_header = mc; 130 130 struct extended_sigtable *ext_header; ··· 161 161 if (mc_hdr->rev <= new_rev) 162 162 return 0; 163 163 164 - return get_matching_sig(csig, cpf, new_rev, mc); 164 + return get_matching_sig(csig, cpf, mc); 165 165 } 166 166 EXPORT_SYMBOL_GPL(get_matching_microcode);