From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424427AbcFHJzM (ORCPT ); Wed, 8 Jun 2016 05:55:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56352 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423385AbcFHJzH (ORCPT ); Wed, 8 Jun 2016 05:55:07 -0400 Date: Wed, 8 Jun 2016 02:54:10 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: linux-kernel@vger.kernel.org, brgerst@gmail.com, peterz@infradead.org, bp@suse.de, dvlasenk@redhat.com, tglx@linutronix.de, bp@alien8.de, torvalds@linux-foundation.org, hpa@zytor.com, mingo@kernel.org, luto@amacapital.net Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, bp@alien8.de, linux-kernel@vger.kernel.org, brgerst@gmail.com, bp@suse.de, dvlasenk@redhat.com, peterz@infradead.org, hpa@zytor.com, mingo@kernel.org, luto@amacapital.net In-Reply-To: <1465225850-7352-7-git-send-email-bp@alien8.de> References: <1465225850-7352-7-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode/intel: Rename load_microcode_early() to find_microcode_patch() Git-Commit-ID: 9198251af1554c21fae8e43a940a8bed435ee1b3 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: 9198251af1554c21fae8e43a940a8bed435ee1b3 Gitweb: http://git.kernel.org/tip/9198251af1554c21fae8e43a940a8bed435ee1b3 Author: Borislav Petkov AuthorDate: Mon, 6 Jun 2016 17:10:47 +0200 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 11:04:20 +0200 x86/microcode/intel: Rename load_microcode_early() to find_microcode_patch() This function does exactly that: it goes through the previously saved array of microcode blobs and finds the proper one for the current CPU. Rename it accordingly. No functionality change. Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1465225850-7352-7-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/microcode/intel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index d852ca9..b5759a3 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -58,7 +58,7 @@ static struct ucode_blobs { } blobs; static enum ucode_state -load_microcode_early(struct microcode_intel **saved, +find_microcode_patch(struct microcode_intel **saved, unsigned int num_saved, struct ucode_cpu_info *uci) { struct microcode_intel *ucode_ptr, *new_mc = NULL; @@ -127,13 +127,13 @@ load_microcode(struct mc_saved_data *mcs, unsigned long *mc_ptrs, if (!mcs->mc_saved) { copy_ptrs(mc_saved_tmp, mc_ptrs, offset, count); - return load_microcode_early(mc_saved_tmp, count, uci); + return find_microcode_patch(mc_saved_tmp, count, uci); } else { #ifdef CONFIG_X86_32 microcode_phys(mc_saved_tmp, mcs); - return load_microcode_early(mc_saved_tmp, count, uci); + return find_microcode_patch(mc_saved_tmp, count, uci); #else - return load_microcode_early(mcs->mc_saved, count, uci); + return find_microcode_patch(mcs->mc_saved, count, uci); #endif } } @@ -834,7 +834,7 @@ void reload_ucode_intel(void) collect_cpu_info_early(&uci); - ret = load_microcode_early(mc_saved_data.mc_saved, + ret = find_microcode_patch(mc_saved_data.mc_saved, mc_saved_data.num_saved, &uci); if (ret != UCODE_OK) return;