summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu/microcode
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2015-02-09 18:10:29 +0100
committerBorislav Petkov <bp@suse.de>2015-03-02 20:32:03 +0100
commit4f5e5f2b574804ed330e20456d5b86a4259544ad (patch)
tree60db4c46f14a4039e93d75fb19eba1a0df5c73dc /arch/x86/kernel/cpu/microcode
parentc868570e745781736366b83191aae2ccb9de2d1c (diff)
x86/microcode/intel: Rename update_match_revision()
... to revision_is_newer() and push it up into the header and make it an inline function. Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode')
-rw-r--r--arch/x86/kernel/cpu/microcode/intel_early.c2
-rw-r--r--arch/x86/kernel/cpu/microcode/intel_lib.c8
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c
index 94ec304b7af3..cd42b3a55897 100644
--- a/arch/x86/kernel/cpu/microcode/intel_early.c
+++ b/arch/x86/kernel/cpu/microcode/intel_early.c
@@ -285,7 +285,7 @@ static unsigned int _save_mc(struct microcode_intel **mc_saved,
found = 1;
- if (!update_match_revision(mc_hdr, new_rev))
+ if (!revision_is_newer(mc_hdr, new_rev))
continue;
/*
diff --git a/arch/x86/kernel/cpu/microcode/intel_lib.c b/arch/x86/kernel/cpu/microcode/intel_lib.c
index ce69320d0179..7e259d99b0aa 100644
--- a/arch/x86/kernel/cpu/microcode/intel_lib.c
+++ b/arch/x86/kernel/cpu/microcode/intel_lib.c
@@ -38,12 +38,6 @@ update_match_cpu(unsigned int csig, unsigned int cpf,
return (!sigmatch(sig, csig, pf, cpf)) ? 0 : 1;
}
-int
-update_match_revision(struct microcode_header_intel *mc_header, int rev)
-{
- return (mc_header->rev <= rev) ? 0 : 1;
-}
-
int microcode_sanity_check(void *mc, int print_err)
{
unsigned long total_size, data_size, ext_table_size;
@@ -166,7 +160,7 @@ int get_matching_microcode(unsigned int csig, int cpf, void *mc, int rev)
{
struct microcode_header_intel *mc_header = mc;
- if (!update_match_revision(mc_header, rev))
+ if (!revision_is_newer(mc_header, rev))
return 0;
return get_matching_sig(csig, cpf, mc, rev);