git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86, nmi_watchdog: Remove the old nmi_watchdog
[sfrench/cifs-2.6.git]
/
include
/
linux
/
nmi.h
diff --git
a/include/linux/nmi.h
b/include/linux/nmi.h
index 06aab5eee134cd56c4bade9005912fa3a785a327..0cb3e5c246d04d15fbb471febcf00b8b29a8a8bb 100644
(file)
--- a/
include/linux/nmi.h
+++ b/
include/linux/nmi.h
@@
-16,10
+16,7
@@
*/
#ifdef ARCH_HAS_NMI_WATCHDOG
#include <asm/nmi.h>
*/
#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
+#endif
#ifndef CONFIG_HARDLOCKUP_DETECTOR
static inline void touch_nmi_watchdog(void)
{
#ifndef CONFIG_HARDLOCKUP_DETECTOR
static inline void touch_nmi_watchdog(void)
{
@@
-30,7
+27,6
@@
extern void touch_nmi_watchdog(void);
#endif
static inline void acpi_nmi_disable(void) { }
static inline void acpi_nmi_enable(void) { }
#endif
static inline void acpi_nmi_disable(void) { }
static inline void acpi_nmi_enable(void) { }
-#endif
/*
* Create trigger_all_cpu_backtrace() out of the arch-provided
/*
* Create trigger_all_cpu_backtrace() out of the arch-provided