From 489ae815b0f301001da1661798f554d1961a76c5 Mon Sep 17 00:00:00 2001
From: Don Zickus <dzickus@redhat.com>
Date: Thu, 18 Feb 2010 21:56:52 -0500
Subject: [PATCH] --- yaml --- r: 205383 b: refs/heads/master c:
 2cc4452bc31fc1cde6f0b64a4eb13269f982787d h: refs/heads/master i:   205381:
 c09368775c6723ff5974cf6d8f9d8c12ce88e9d2   205379:
 72d9d7c56fc7f9c2e78b2db6e00c28d13095693a   205375:
 71a48e81b501281d735f79a073a1af9544abd021 v: v3

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

diff --git a/[refs] b/[refs]
index 24bfcb035b04..78daf7024ab2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96ca4028aca0638d0e11dcbfabc4283054072933
+refs/heads/master: 2cc4452bc31fc1cde6f0b64a4eb13269f982787d
diff --git a/trunk/arch/x86/kernel/apic/hw_nmi.c b/trunk/arch/x86/kernel/apic/hw_nmi.c
index 312d772c5c35..0b4d205a6b8e 100644
--- a/trunk/arch/x86/kernel/apic/hw_nmi.c
+++ b/trunk/arch/x86/kernel/apic/hw_nmi.c
@@ -92,6 +92,7 @@ u64 hw_nmi_get_sample_period(void)
         return cpu_khz * 1000;
 }
 
+#ifdef ARCH_HAS_NMI_WATCHDOG
 void arch_trigger_all_cpu_backtrace(void)
 {
 	int i;
@@ -108,6 +109,7 @@ void arch_trigger_all_cpu_backtrace(void)
 		mdelay(1);
 	}
 }
+#endif
 
 /* STUB calls to mimic old nmi_watchdog behaviour */
 #if defined(CONFIG_X86_LOCAL_APIC)