From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424438AbcFHJzh (ORCPT ); Wed, 8 Jun 2016 05:55:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56380 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423385AbcFHJze (ORCPT ); Wed, 8 Jun 2016 05:55:34 -0400 Date: Wed, 8 Jun 2016 02:54:38 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, brgerst@gmail.com, luto@amacapital.net, mingo@kernel.org, dvlasenk@redhat.com, bp@suse.de, tglx@linutronix.de, bp@alien8.de, hpa@zytor.com, peterz@infradead.org Reply-To: peterz@infradead.org, tglx@linutronix.de, bp@suse.de, dvlasenk@redhat.com, hpa@zytor.com, bp@alien8.de, luto@amacapital.net, mingo@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, brgerst@gmail.com In-Reply-To: <1465225850-7352-8-git-send-email-bp@alien8.de> References: <1465225850-7352-8-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode/intel: Unexport save_mc_for_early() Git-Commit-ID: 0c5fa827f1130d05858f158022c21e9e7e5cff92 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: 0c5fa827f1130d05858f158022c21e9e7e5cff92 Gitweb: http://git.kernel.org/tip/0c5fa827f1130d05858f158022c21e9e7e5cff92 Author: Borislav Petkov AuthorDate: Mon, 6 Jun 2016 17:10:48 +0200 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 11:04:20 +0200 x86/microcode/intel: Unexport save_mc_for_early() It is used only in intel.c, drop the CONFIG_HOTPLUG_CPU ifdeffery from the header and turn it into a void function because its return value wasn't being used anyway. 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-8-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/include/asm/microcode_intel.h | 5 ----- arch/x86/kernel/cpu/microcode/intel.c | 15 ++++++--------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h index 603417f..5e69154 100644 --- a/arch/x86/include/asm/microcode_intel.h +++ b/arch/x86/include/asm/microcode_intel.h @@ -70,9 +70,4 @@ static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; static inline void reload_ucode_intel(void) {} #endif -#ifdef CONFIG_HOTPLUG_CPU -extern int save_mc_for_early(u8 *mc); -#else -static inline int save_mc_for_early(u8 *mc) { return 0; } -#endif #endif /* _ASM_X86_MICROCODE_INTEL_H */ diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index b5759a3..359e203 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -456,8 +456,6 @@ static void show_saved_mc(void) #endif } -#ifdef CONFIG_HOTPLUG_CPU -static DEFINE_MUTEX(x86_cpu_microcode_mutex); /* * Save this mc into mc_saved_data. So it will be loaded early when a CPU is * hot added or resumes. @@ -465,14 +463,16 @@ static DEFINE_MUTEX(x86_cpu_microcode_mutex); * Please make sure this mc should be a valid microcode patch before calling * this function. */ -int save_mc_for_early(u8 *mc) +static void save_mc_for_early(u8 *mc) { +#ifdef CONFIG_HOTPLUG_CPU + static DEFINE_MUTEX(x86_cpu_microcode_mutex); + struct microcode_intel *mc_saved_tmp[MAX_UCODE_COUNT]; unsigned int mc_saved_count_init; unsigned int num_saved; struct microcode_intel **mc_saved; - int ret = 0; - int i; + int ret, i; /* * Hold hotplug lock so mc_saved_data is not accessed by a CPU in @@ -515,11 +515,8 @@ int save_mc_for_early(u8 *mc) out: mutex_unlock(&x86_cpu_microcode_mutex); - - return ret; -} -EXPORT_SYMBOL_GPL(save_mc_for_early); #endif +} static bool __init load_builtin_intel_microcode(struct cpio_data *cp) {