From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932514AbbJUKKK (ORCPT ); Wed, 21 Oct 2015 06:10:10 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42364 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932149AbbJUKKF (ORCPT ); Wed, 21 Oct 2015 06:10:05 -0400 Date: Wed, 21 Oct 2015 03:08:56 -0700 From: tip-bot for Borislav Petkov Message-ID: 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 Reply-To: dvlasenk@redhat.com, brgerst@gmail.com, tony.luck@intel.com, linux-kernel@vger.kernel.org, arjan@linux.intel.com, tglx@linutronix.de, luto@amacapital.net, bp@alien8.de, mingo@kernel.org, rafael.j.wysocki@intel.com, peterz@infradead.org, hpa@zytor.com, bp@suse.de, davej@codemonkey.org.uk, torvalds@linux-foundation.org, len.brown@intel.com In-Reply-To: <1445334889-300-6-git-send-email-bp@alien8.de> References: <1445334889-300-6-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/microcode/intel: Move #ifdef DEBUG inside the function Git-Commit-ID: c595ac2bac930ce79f336c7a7e45e1ea38abfe16 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: c595ac2bac930ce79f336c7a7e45e1ea38abfe16 Gitweb: http://git.kernel.org/tip/c595ac2bac930ce79f336c7a7e45e1ea38abfe16 Author: Borislav Petkov AuthorDate: Tue, 20 Oct 2015 11:54:48 +0200 Committer: Ingo Molnar 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 Cc: Andy Lutomirski Cc: Arjan van de Ven Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Jones Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Len Brown Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Thomas Gleixner Cc: Tony Luck Link: http://lkml.kernel.org/r/1445334889-300-6-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- 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);