diff options
author | Borislav Petkov <bp@suse.de> | 2015-05-17 06:55:01 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-05-18 03:32:37 -0400 |
commit | e774eaa9f6069b70b5208aa50539a09f41cf7e73 (patch) | |
tree | 0d7fcf199efcfc15569a2079b1872e89a9249e84 | |
parent | 9e5aed83bbd95ca2dee732f56a7a278350cef807 (diff) |
x86/microcode/intel: Rename get_matching_sig()
... to find_matching_signature() which is exactly what it does.
No functionality change.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1431860101-14847-5-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/include/asm/microcode_intel.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/microcode/intel_early.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/microcode/intel_lib.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h index 45a318f677be..7991c606125d 100644 --- a/arch/x86/include/asm/microcode_intel.h +++ b/arch/x86/include/asm/microcode_intel.h | |||
@@ -55,7 +55,7 @@ struct extended_sigtable { | |||
55 | 55 | ||
56 | extern int has_newer_microcode(void *mc, unsigned int csig, int cpf, int rev); | 56 | extern int has_newer_microcode(void *mc, unsigned int csig, int cpf, int rev); |
57 | extern int microcode_sanity_check(void *mc, int print_err); | 57 | extern int microcode_sanity_check(void *mc, int print_err); |
58 | extern int get_matching_sig(unsigned int csig, int cpf, void *mc); | 58 | extern int find_matching_signature(void *mc, unsigned int csig, int cpf); |
59 | 59 | ||
60 | #ifdef CONFIG_MICROCODE_INTEL_EARLY | 60 | #ifdef CONFIG_MICROCODE_INTEL_EARLY |
61 | extern void __init load_ucode_intel_bsp(void); | 61 | extern void __init load_ucode_intel_bsp(void); |
diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c index 5f828268357d..10dff3f3f686 100644 --- a/arch/x86/kernel/cpu/microcode/intel_early.c +++ b/arch/x86/kernel/cpu/microcode/intel_early.c | |||
@@ -256,7 +256,7 @@ static unsigned int _save_mc(struct microcode_intel **mc_saved, | |||
256 | sig = mc_saved_hdr->sig; | 256 | sig = mc_saved_hdr->sig; |
257 | pf = mc_saved_hdr->pf; | 257 | pf = mc_saved_hdr->pf; |
258 | 258 | ||
259 | if (!get_matching_sig(sig, pf, ucode_ptr)) | 259 | if (!find_matching_signature(ucode_ptr, sig, pf)) |
260 | continue; | 260 | continue; |
261 | 261 | ||
262 | found = 1; | 262 | found = 1; |
diff --git a/arch/x86/kernel/cpu/microcode/intel_lib.c b/arch/x86/kernel/cpu/microcode/intel_lib.c index def9c935f3f9..1883d252ff7d 100644 --- a/arch/x86/kernel/cpu/microcode/intel_lib.c +++ b/arch/x86/kernel/cpu/microcode/intel_lib.c | |||
@@ -131,7 +131,7 @@ EXPORT_SYMBOL_GPL(microcode_sanity_check); | |||
131 | /* | 131 | /* |
132 | * Returns 1 if update has been found, 0 otherwise. | 132 | * Returns 1 if update has been found, 0 otherwise. |
133 | */ | 133 | */ |
134 | int get_matching_sig(unsigned int csig, int cpf, void *mc) | 134 | int find_matching_signature(void *mc, unsigned int csig, int cpf) |
135 | { | 135 | { |
136 | struct microcode_header_intel *mc_hdr = mc; | 136 | struct microcode_header_intel *mc_hdr = mc; |
137 | struct extended_sigtable *ext_hdr; | 137 | struct extended_sigtable *ext_hdr; |
@@ -166,6 +166,6 @@ int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev) | |||
166 | if (mc_hdr->rev <= new_rev) | 166 | if (mc_hdr->rev <= new_rev) |
167 | return 0; | 167 | return 0; |
168 | 168 | ||
169 | return get_matching_sig(csig, cpf, mc); | 169 | return find_matching_signature(mc, csig, cpf); |
170 | } | 170 | } |
171 | EXPORT_SYMBOL_GPL(has_newer_microcode); | 171 | EXPORT_SYMBOL_GPL(has_newer_microcode); |