Commit da9b5076 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

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



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

Signed-off-by: default avatarBorislav 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: default avatarIngo Molnar <mingo@kernel.org>
parent a1a32d29

arch/x86/include/asm/microcode_intel.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct extended_sigtable { 


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 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

extern void __init load_ucode_intel_bsp(void);

arch/x86/kernel/cpu/microcode/intel_early.c

+2 −3
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static unsigned int _save_mc(struct microcode_intel **mc_saved, 
			     u8 *ucode_ptr, unsigned int num_saved)

{

	struct microcode_header_intel *mc_hdr, *mc_saved_hdr;

	unsigned int sig, pf, new_rev;

	unsigned int sig, pf;

	int found = 0, i;



	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];

		sig	     = mc_saved_hdr->sig;

		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;



		found = 1;

arch/x86/kernel/cpu/microcode/intel_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ EXPORT_SYMBOL_GPL(microcode_sanity_check); 
/*

 * 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 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)

		return 0;



	return get_matching_sig(csig, cpf, new_rev, mc);

	return get_matching_sig(csig, cpf, mc);

}

EXPORT_SYMBOL_GPL(get_matching_microcode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE