From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:x86/microcode] x86/microcode: Remove one #ifdef clause
Date: Tue, 25 Oct 2016 09:29:16 -0700 [thread overview]
Message-ID: <tip-f5bdfefbf96279b4eb431606cec7a662f5d3ba88@git.kernel.org> (raw)
In-Reply-To: <20161025095522.11964-5-bp@alien8.de>
Commit-ID: f5bdfefbf96279b4eb431606cec7a662f5d3ba88
Gitweb: http://git.kernel.org/tip/f5bdfefbf96279b4eb431606cec7a662f5d3ba88
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 25 Oct 2016 11:55:14 +0200
Committer: Ingo Molnar <mingo@kernel.org>
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 <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20161025095522.11964-5-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
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) { }
next prev parent reply other threads:[~2016-10-25 16:30 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 9:55 [PATCH 00/12] x86/microcode: Rework microcode loading Borislav Petkov
2016-10-25 9:55 ` [PATCH 01/12] x86/microcode: Run the AP-loading routine only on the application processors Borislav Petkov
2016-10-25 16:27 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 02/12] x86/microcode: Move driver authors to CREDITS Borislav Petkov
2016-10-25 16:28 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 03/12] x86/microcode/intel: Simplify generic_load_microcode() Borislav Petkov
2016-10-25 16:28 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 04/12] x86/microcode: Remove one ifdef clause Borislav Petkov
2016-10-25 16:29 ` tip-bot for Borislav Petkov [this message]
2016-10-25 9:55 ` [PATCH 05/12] x86/microcode: Export the microcode cache linked list Borislav Petkov
2016-10-25 16:29 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 06/12] x86/microcode/AMD: Hand down the CPU family Borislav Petkov
2016-10-25 16:30 ` [tip:x86/microcode] x86/microcode/amd: " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 07/12] x86/microcode: Issue the debug printk on resume only on success Borislav Petkov
2016-10-25 16:30 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 08/12] x86/microcode: Collect CPU info on resume Borislav Petkov
2016-10-25 16:31 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 09/12] x86/microcode/AMD: Retract functions Borislav Petkov
2016-10-25 16:31 ` [tip:x86/microcode] x86/microcode/amd: Move private inlines to .c and mark local functions static tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 10/12] x86/microcode/intel: Remove intel_lib.c Borislav Petkov
2016-10-25 16:32 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 11/12] x86/microcode: Rework microcode loading Borislav Petkov
2016-10-25 16:32 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 12/12] x86/microcode: Bump driver version, update copyrights Borislav Petkov
2016-10-25 16:33 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-f5bdfefbf96279b4eb431606cec7a662f5d3ba88@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=hpa@zytor.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).