From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753407AbbERJMP (ORCPT ); Mon, 18 May 2015 05:12:15 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40989 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753368AbbERJL7 (ORCPT ); Mon, 18 May 2015 05:11:59 -0400 Date: Mon, 18 May 2015 02:11:25 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, bp@suse.de, quentin.casasnovas@oracle.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org Reply-To: mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, bp@suse.de, quentin.casasnovas@oracle.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org In-Reply-To: <1431860101-14847-5-git-send-email-bp@alien8.de> References: <1431860101-14847-5-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode/intel: Rename get_matching_sig( ) Git-Commit-ID: e774eaa9f6069b70b5208aa50539a09f41cf7e73 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e774eaa9f6069b70b5208aa50539a09f41cf7e73 Gitweb: http://git.kernel.org/tip/e774eaa9f6069b70b5208aa50539a09f41cf7e73 Author: Borislav Petkov AuthorDate: Sun, 17 May 2015 12:55:01 +0200 Committer: Ingo Molnar CommitDate: Mon, 18 May 2015 09:32:37 +0200 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 Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Quentin Casasnovas Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1431860101-14847-5-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/include/asm/microcode_intel.h | 2 +- arch/x86/kernel/cpu/microcode/intel_early.c | 2 +- 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 45a318f..7991c60 100644 --- a/arch/x86/include/asm/microcode_intel.h +++ b/arch/x86/include/asm/microcode_intel.h @@ -55,7 +55,7 @@ struct extended_sigtable { extern int has_newer_microcode(void *mc, unsigned int csig, int cpf, int rev); extern int microcode_sanity_check(void *mc, int print_err); -extern int get_matching_sig(unsigned int csig, int cpf, void *mc); +extern int find_matching_signature(void *mc, unsigned int csig, int cpf); #ifdef CONFIG_MICROCODE_INTEL_EARLY 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 5f82826..10dff3f 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, sig = mc_saved_hdr->sig; pf = mc_saved_hdr->pf; - if (!get_matching_sig(sig, pf, ucode_ptr)) + if (!find_matching_signature(ucode_ptr, sig, pf)) continue; found = 1; diff --git a/arch/x86/kernel/cpu/microcode/intel_lib.c b/arch/x86/kernel/cpu/microcode/intel_lib.c index def9c93..1883d25 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); /* * Returns 1 if update has been found, 0 otherwise. */ -int get_matching_sig(unsigned int csig, int cpf, void *mc) +int find_matching_signature(void *mc, unsigned int csig, int cpf) { struct microcode_header_intel *mc_hdr = mc; struct extended_sigtable *ext_hdr; @@ -166,6 +166,6 @@ int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev) if (mc_hdr->rev <= new_rev) return 0; - return get_matching_sig(csig, cpf, mc); + return find_matching_signature(mc, csig, cpf); } EXPORT_SYMBOL_GPL(has_newer_microcode);