evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
@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>
This commit is contained in:
Borislav Petkov 2015-04-10 14:32:10 +02:00 • committed by Ingo Molnar
parent a1a32d29f9
commit da9b50765e
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/include/asm/microcode_intel.h
View file

@ -58,7 +58,7 @@ struct extended_sigtable {
extern int get_matching_microcode(unsigned int csig, int cpf, int rev, void *mc); extern int get_matching_microcode(unsigned int csig, int cpf, int rev, void *mc);
extern int microcode_sanity_check(void *mc, int print_err); extern int microcode_sanity_check(void *mc, int print_err);
extern int get_matching_sig(unsigned int csig, int cpf, int rev, void *mc); extern int get_matching_sig(unsigned int csig, int cpf, void *mc);
#ifdef CONFIG_MICROCODE_INTEL_EARLY #ifdef CONFIG_MICROCODE_INTEL_EARLY
extern void __init load_ucode_intel_bsp(void); extern void __init load_ucode_intel_bsp(void);

5
arch/x86/kernel/cpu/microcode/intel_early.c
View file

@ -246,7 +246,7 @@ static unsigned int _save_mc(struct microcode_intel **mc_saved,
u8 *ucode_ptr, unsigned int num_saved) u8 *ucode_ptr, unsigned int num_saved)
{ {
struct microcode_header_intel *mc_hdr, *mc_saved_hdr; struct microcode_header_intel *mc_hdr, *mc_saved_hdr;
unsigned int sig, pf, new_rev; unsigned int sig, pf;
int found = 0, i; int found = 0, i;
mc_hdr = (struct microcode_header_intel *)ucode_ptr; mc_hdr = (struct microcode_header_intel *)ucode_ptr;
@ -255,9 +255,8 @@ static unsigned int _save_mc(struct microcode_intel **mc_saved,
mc_saved_hdr = (struct microcode_header_intel *)mc_saved[i]; mc_saved_hdr = (struct microcode_header_intel *)mc_saved[i];
sig = mc_saved_hdr->sig; sig = mc_saved_hdr->sig;
pf = mc_saved_hdr->pf; pf = mc_saved_hdr->pf;
new_rev = mc_hdr->rev;
if (!get_matching_sig(sig, pf, new_rev, ucode_ptr)) if (!get_matching_sig(sig, pf, ucode_ptr))
continue; continue;
found = 1; found = 1;

4
arch/x86/kernel/cpu/microcode/intel_lib.c
View file

@ -124,7 +124,7 @@ EXPORT_SYMBOL_GPL(microcode_sanity_check);
/* /*
* Returns 1 if update has been found, 0 otherwise. * Returns 1 if update has been found, 0 otherwise.
*/ */
int get_matching_sig(unsigned int csig, int cpf, int rev, void *mc) int get_matching_sig(unsigned int csig, int cpf, void *mc)
{ {
struct microcode_header_intel *mc_header = mc; struct microcode_header_intel *mc_header = mc;
struct extended_sigtable *ext_header; struct extended_sigtable *ext_header;
@ -161,6 +161,6 @@ int get_matching_microcode(unsigned int csig, int cpf, int new_rev, void *mc)
if (mc_hdr->rev <= new_rev) if (mc_hdr->rev <= new_rev)
return 0; return 0;
return get_matching_sig(csig, cpf, new_rev, mc); return get_matching_sig(csig, cpf, mc);
} }
EXPORT_SYMBOL_GPL(get_matching_microcode); EXPORT_SYMBOL_GPL(get_matching_microcode);