2010-12-09 08:47:36

by Rakib Mullick

Subject: [PATCH] x86: Fix warning in hw_nmi.c

commit 0e2af2a9abf94b408ff70679b692a8644fed4aab fixed this warning, it
again introduced by commit 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a.
This patch fixes it by moving arch_trigger_all_cpu_backtrace few lines
above backtrace_mask's declaration.

We were warned by the following warning:

arch/x86/kernel/apic/hw_nmi.c:29: warning: ?backtrace_mask? defined but not used


Signed-off-by: Rakib Mullick <[email protected]>
---

diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index a0e71cb..0c294b3 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -25,10 +25,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;

2010-12-09 15:10:08

by Rakib Mullick

Subject: [tip:perf/core] x86: Address 'unused' warning in hw_nmi.c again

Commit-ID: 2c6cb1053ad8b61ab9fb50b578d0ffea959f7583
Gitweb: http://git.kernel.org/tip/2c6cb1053ad8b61ab9fb50b578d0ffea959f7583
Author: Rakib Mullick <[email protected]>
AuthorDate: Thu, 9 Dec 2010 14:47:34 +0600
Committer: Thomas Gleixner <[email protected]>
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 <[email protected]>
Cc: Don Zickus <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
---
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;

2010-12-09 15:56:55

by Don Zickus

Subject: Re: [PATCH] x86: Fix warning in hw_nmi.c

On Thu, Dec 09, 2010 at 02:47:34PM +0600, Rakib Mullick wrote:
> commit 0e2af2a9abf94b408ff70679b692a8644fed4aab fixed this warning, it
> again introduced by commit 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a.
> This patch fixes it by moving arch_trigger_all_cpu_backtrace few lines
> above backtrace_mask's declaration.
>
> We were warned by the following warning:
>
> arch/x86/kernel/apic/hw_nmi.c:29: warning: ‘backtrace_mask’ defined but not used
>
>
> Signed-off-by: Rakib Mullick <[email protected]>

Thanks Rakib.

I already have this fix lined up for Ingo in another patch series.

http://thread.gmane.org/gmane.linux.kernel/1069682/focus=1069960

Hopefully Ingo will get a chance to include it soon.

Cheers,
Don