From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: bp@alien8.de, luto@amacapital.net, mingo@kernel.org,
rafael.j.wysocki@intel.com, hpa@zytor.com, peterz@infradead.org,
torvalds@linux-foundation.org, bp@suse.de,
davej@codemonkey.org.uk, len.brown@intel.com,
dvlasenk@redhat.com, brgerst@gmail.com, tony.luck@intel.com,
tglx@linutronix.de, linux-kernel@vger.kernel.org,
arjan@linux.intel.com
Subject: [tip:ras/core] x86/microcode/intel: Move #ifdef DEBUG inside the function
Date: Wed, 21 Oct 2015 03:08:56 -0700 [thread overview]
Message-ID: <tip-c595ac2bac930ce79f336c7a7e45e1ea38abfe16@git.kernel.org> (raw)
In-Reply-To: <1445334889-300-6-git-send-email-bp@alien8.de>
Commit-ID: c595ac2bac930ce79f336c7a7e45e1ea38abfe16
Gitweb: http://git.kernel.org/tip/c595ac2bac930ce79f336c7a7e45e1ea38abfe16
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 20 Oct 2015 11:54:48 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 21 Oct 2015 11:22:12 +0200
x86/microcode/intel: Move #ifdef DEBUG inside the function
... and save us the stub.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/1445334889-300-6-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/cpu/microcode/intel.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 3f32558..ce47402 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -389,9 +389,9 @@ static int collect_cpu_info_early(struct ucode_cpu_info *uci)
return 0;
}
-#ifdef DEBUG
static void show_saved_mc(void)
{
+#ifdef DEBUG
int i, j;
unsigned int sig, pf, rev, total_size, data_size, date;
struct ucode_cpu_info uci;
@@ -449,12 +449,8 @@ static void show_saved_mc(void)
}
}
-}
-#else
-static inline void show_saved_mc(void)
-{
-}
#endif
+}
#ifdef CONFIG_HOTPLUG_CPU
static DEFINE_MUTEX(x86_cpu_microcode_mutex);
next prev parent reply other threads:[~2015-10-21 10:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 9:54 [PATCH 0/6] x86/microcode: Merge the early loader Borislav Petkov
2015-10-20 9:54 ` [PATCH 1/6] x86/microcode: Unmodularize driver Borislav Petkov
2015-10-21 10:07 ` [tip:ras/core] x86/microcode: Unmodularize the microcode driver tip-bot for Borislav Petkov
2015-10-20 9:54 ` [PATCH 2/6] x86/microcode: Merge early loader Borislav Petkov
2015-10-21 10:07 ` [tip:ras/core] x86/microcode: Merge the early microcode loader tip-bot for Borislav Petkov
2015-11-06 19:22 ` [PATCH 2/6] x86/microcode: Merge early loader Josh Boyer
2015-11-06 19:31 ` Borislav Petkov
2015-11-09 9:42 ` Harald Hoyer
2015-11-09 10:11 ` Borislav Petkov
2015-10-20 9:54 ` [PATCH 3/6] x86/microcode: Remove modularization leftovers Borislav Petkov
2015-10-21 10:08 ` [tip:ras/core] " tip-bot for Borislav Petkov
2015-10-20 9:54 ` [PATCH 4/6] x86/microcode/amd: Remove maintainers from comments Borislav Petkov
2015-10-21 10:08 ` [tip:ras/core] " tip-bot for Borislav Petkov
2015-10-20 9:54 ` [PATCH 5/6] x86/microcode/intel: Move ifdef DEBUG inside the function Borislav Petkov
2015-10-21 10:08 ` tip-bot for Borislav Petkov [this message]
2015-10-20 9:54 ` [PATCH 6/6] MAINTAINERS: Unify microcode driver section Borislav Petkov
2015-10-21 10:09 ` [tip:ras/core] MAINTAINERS: Unify the " 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-c595ac2bac930ce79f336c7a7e45e1ea38abfe16@git.kernel.org \
--to=tipbot@zytor.com \
--cc=arjan@linux.intel.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=brgerst@gmail.com \
--cc=davej@codemonkey.org.uk \
--cc=dvlasenk@redhat.com \
--cc=hpa@zytor.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--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