From 1e3701e99d581d1047e0d0dc66e8dcc306dfd31f Mon Sep 17 00:00:00 2001
From: Rakib Mullick <rakib.mullick@gmail.com>
Date: Thu, 9 Dec 2010 14:47:34 +0600
Subject: [PATCH] --- yaml --- r: 223903 b: refs/heads/master c:
 2c6cb1053ad8b61ab9fb50b578d0ffea959f7583 h: refs/heads/master i:   223901:
 f7eff47149fecec0273caa87b19e420bef604d0c   223899:
 f02676473fd93b8f2d32375fd5be41b9dbc162a2   223895:
 ffe0dfcb0ff235ded453acc1a9698ac6e8cb078d   223887:
 b2ffd7d7efca14d013f225c1eef6f6d44c49f3d5   223871:
 91249362cfbe20e49aa35b514d8250e578df1144 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/apic/hw_nmi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a546ff31ef21..433744a725e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c277443cfc29b1623b4923219ff0bdb48b91b589
+refs/heads/master: 2c6cb1053ad8b61ab9fb50b578d0ffea959f7583
diff --git a/trunk/arch/x86/kernel/apic/hw_nmi.c b/trunk/arch/x86/kernel/apic/hw_nmi.c
index a0e71cb4fa9c..057f1ebebe0c 100644
--- a/trunk/arch/x86/kernel/apic/hw_nmi.c
+++ b/trunk/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;