From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759485AbcJYQaT (ORCPT ); Tue, 25 Oct 2016 12:30:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39822 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759345AbcJYQaP (ORCPT ); Tue, 25 Oct 2016 12:30:15 -0400 Date: Tue, 25 Oct 2016 09:29:16 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: peterz@infradead.org, hpa@zytor.com, dvlasenk@redhat.com, bp@suse.de, torvalds@linux-foundation.org, bp@alien8.de, mingo@kernel.org, brgerst@gmail.com, luto@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, jpoimboe@redhat.com Reply-To: jpoimboe@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, luto@kernel.org, brgerst@gmail.com, mingo@kernel.org, bp@alien8.de, torvalds@linux-foundation.org, bp@suse.de, dvlasenk@redhat.com, hpa@zytor.com, peterz@infradead.org In-Reply-To: <20161025095522.11964-5-bp@alien8.de> References: <20161025095522.11964-5-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode: Remove one #ifdef clause Git-Commit-ID: f5bdfefbf96279b4eb431606cec7a662f5d3ba88 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: f5bdfefbf96279b4eb431606cec7a662f5d3ba88 Gitweb: http://git.kernel.org/tip/f5bdfefbf96279b4eb431606cec7a662f5d3ba88 Author: Borislav Petkov AuthorDate: Tue, 25 Oct 2016 11:55:14 +0200 Committer: Ingo Molnar CommitDate: Tue, 25 Oct 2016 12:28:57 +0200 x86/microcode: Remove one #ifdef clause Move the function declaration to the other #ifdef CONFIG_MICROCODE together with the other functions. 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: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20161025095522.11964-5-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/include/asm/microcode.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index da0d81f..05e56d0 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -56,12 +56,6 @@ struct ucode_cpu_info { }; extern struct ucode_cpu_info ucode_cpu_info[]; -#ifdef CONFIG_MICROCODE -int __init microcode_init(void); -#else -static inline int __init microcode_init(void) { return 0; }; -#endif - #ifdef CONFIG_MICROCODE_INTEL extern struct microcode_ops * __init init_intel_microcode(void); #else @@ -131,11 +125,13 @@ static inline unsigned int x86_cpuid_family(void) } #ifdef CONFIG_MICROCODE +int __init microcode_init(void); extern void __init load_ucode_bsp(void); extern void load_ucode_ap(void); void reload_early_microcode(void); extern bool get_builtin_firmware(struct cpio_data *cd, const char *name); #else +static inline int __init microcode_init(void) { return 0; }; static inline void __init load_ucode_bsp(void) { } static inline void load_ucode_ap(void) { } static inline void reload_early_microcode(void) { }