Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753398Ab0LIPKI (ORCPT ); Thu, 9 Dec 2010 10:10:08 -0500 Received: from hera.kernel.org ([140.211.167.34]:48859 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751631Ab0LIPKG (ORCPT ); Thu, 9 Dec 2010 10:10:06 -0500 Date: Thu, 9 Dec 2010 15:09:55 GMT From: tip-bot for Rakib Mullick Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, fweisbec@gmail.com, rakib.mullick@gmail.com, tglx@linutronix.de, dzickus@redhat.com Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, rakib.mullick@gmail.com, fweisbec@gmail.com, tglx@linutronix.de, dzickus@redhat.com In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] x86: Address 'unused' warning in hw_nmi.c again Message-ID: Git-Commit-ID: 2c6cb1053ad8b61ab9fb50b578d0ffea959f7583 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Thu, 09 Dec 2010 15:09:56 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1851 Lines: 49 Commit-ID: 2c6cb1053ad8b61ab9fb50b578d0ffea959f7583 Gitweb: http://git.kernel.org/tip/2c6cb1053ad8b61ab9fb50b578d0ffea959f7583 Author: Rakib Mullick AuthorDate: Thu, 9 Dec 2010 14:47:34 +0600 Committer: Thomas Gleixner CommitDate: Thu, 9 Dec 2010 16:06:52 +0100 x86: Address 'unused' warning in hw_nmi.c again arch/x86/kernel/apic/hw_nmi.c:29: warning: backtrace_mask defined but not used commit 0e2af2a9(x86, hw_nmi: Move backtrace_mask declaration under ARCH_HAS_NMI_WATCHDOG) addressed this warning, but it was reintroduced by commit 5f2b0ba4(x86, nmi_watchdog: Remove the old nmi_watchdog). Move backtrace_mask into the #ifdef arch_trigger_all_cpu_backtrace section again. Signed-off-by: Rakib Mullick Cc: Don Zickus Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/hw_nmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c index a0e71cb..057f1eb 100644 --- a/arch/x86/kernel/apic/hw_nmi.c +++ b/arch/x86/kernel/apic/hw_nmi.c @@ -24,11 +24,11 @@ u64 hw_nmi_get_sample_period(void) } #endif +#ifdef arch_trigger_all_cpu_backtrace /* For reliability, we're prepared to waste bits here. */ static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly; -#ifdef arch_trigger_all_cpu_backtrace void arch_trigger_all_cpu_backtrace(void) { int i; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/