summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/nmi.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-14 17:50:48 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-14 17:53:43 -0700
commit8ce5e3e45e01ffab38a9f03900181132b9068543 (patch)
tree87dbcacd8a6279d3bea2699448bca63f12d7e9c9 /include/asm-x86_64/nmi.h
parent4e337adae4e960f64043b9f433c4a825c902616c (diff)
Disable NMI watchdog by default properly
This reverts commit 6ebf622b2577c50b1f496bd6a5e8739e55ae7b1c and replaces it with one that actually works. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-x86_64/nmi.h')
-rw-r--r--include/asm-x86_64/nmi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/nmi.h b/include/asm-x86_64/nmi.h
index ceb3d8dac33..72375e7d32a 100644
--- a/include/asm-x86_64/nmi.h
+++ b/include/asm-x86_64/nmi.h
@@ -64,7 +64,7 @@ extern int setup_nmi_watchdog(char *);
extern atomic_t nmi_active;
extern unsigned int nmi_watchdog;
-#define NMI_DEFAULT 0
+#define NMI_DEFAULT -1
#define NMI_NONE 0
#define NMI_IO_APIC 1
#define NMI_LOCAL_APIC 2