X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fnmi.h;h=29af2d5df0972cdac25fd2c73e42cd49976efa8a;hb=afa26be86b65a7183ceac29bdf1f51d6fc6932f0;hp=e16904e28c3a39b57480d5bc5e64f5923cc5434a;hpb=a12f66fccf2e266ad197df142b5ebafc6a169a8c;p=linux-2.6

diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index e16904e28c..29af2d5df0 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -15,9 +15,21 @@
  * disables interrupts for a long time. This call is stateless.
  */
 #ifdef ARCH_HAS_NMI_WATCHDOG
+#include <asm/nmi.h>
 extern void touch_nmi_watchdog(void);
+extern void acpi_nmi_disable(void);
+extern void acpi_nmi_enable(void);
 #else
-# define touch_nmi_watchdog() touch_softlockup_watchdog()
+static inline void touch_nmi_watchdog(void)
+{
+	touch_softlockup_watchdog();
+}
+static inline void acpi_nmi_disable(void) { }
+static inline void acpi_nmi_enable(void) { }
+#endif
+
+#ifndef trigger_all_cpu_backtrace
+#define trigger_all_cpu_backtrace() do { } while (0)
 #endif
 
 #endif