[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-c595ac2bac930ce79f336c7a7e45e1ea38abfe16@git.kernel.org>
Date: Wed, 21 Oct 2015 03:08:56 -0700
From: tip-bot for Borislav Petkov <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: bp@...en8.de, luto@...capital.net, mingo@...nel.org,
rafael.j.wysocki@...el.com, hpa@...or.com, peterz@...radead.org,
torvalds@...ux-foundation.org, bp@...e.de, davej@...emonkey.org.uk,
len.brown@...el.com, dvlasenk@...hat.com, brgerst@...il.com,
tony.luck@...el.com, tglx@...utronix.de,
linux-kernel@...r.kernel.org, arjan@...ux.intel.com
Subject: [tip:ras/core] x86/microcode/intel:
Move #ifdef DEBUG inside the function
Commit-ID: c595ac2bac930ce79f336c7a7e45e1ea38abfe16
Gitweb: http://git.kernel.org/tip/c595ac2bac930ce79f336c7a7e45e1ea38abfe16
Author: Borislav Petkov <bp@...e.de>
AuthorDate: Tue, 20 Oct 2015 11:54:48 +0200
Committer: Ingo Molnar <mingo@...nel.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@...e.de>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Arjan van de Ven <arjan@...ux.intel.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Dave Jones <davej@...emonkey.org.uk>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Len Brown <len.brown@...el.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Tony Luck <tony.luck@...el.com>
Link: http://lkml.kernel.org/r/1445334889-300-6-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@...nel.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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists