diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 20:50:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 20:53:43 -0400 |
| commit | 8ce5e3e45e01ffab38a9f03900181132b9068543 (patch) | |
| tree | 87dbcacd8a6279d3bea2699448bca63f12d7e9c9 /include | |
| parent | 4e337adae4e960f64043b9f433c4a825c902616c (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')
| -rw-r--r-- | include/asm-i386/nmi.h | 2 | ||||
| -rw-r--r-- | include/asm-x86_64/nmi.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/nmi.h b/include/asm-i386/nmi.h index 64544cb85d6a..b04333ea6f31 100644 --- a/include/asm-i386/nmi.h +++ b/include/asm-i386/nmi.h | |||
| @@ -33,7 +33,7 @@ extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason); | |||
| 33 | 33 | ||
| 34 | extern atomic_t nmi_active; | 34 | extern atomic_t nmi_active; |
| 35 | extern unsigned int nmi_watchdog; | 35 | extern unsigned int nmi_watchdog; |
| 36 | #define NMI_DEFAULT 0 | 36 | #define NMI_DEFAULT -1 |
| 37 | #define NMI_NONE 0 | 37 | #define NMI_NONE 0 |
| 38 | #define NMI_IO_APIC 1 | 38 | #define NMI_IO_APIC 1 |
| 39 | #define NMI_LOCAL_APIC 2 | 39 | #define NMI_LOCAL_APIC 2 |
diff --git a/include/asm-x86_64/nmi.h b/include/asm-x86_64/nmi.h index ceb3d8dac33d..72375e7d32a8 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 *); | |||
| 64 | 64 | ||
| 65 | extern atomic_t nmi_active; | 65 | extern atomic_t nmi_active; |
| 66 | extern unsigned int nmi_watchdog; | 66 | extern unsigned int nmi_watchdog; |
| 67 | #define NMI_DEFAULT 0 | 67 | #define NMI_DEFAULT -1 |
| 68 | #define NMI_NONE 0 | 68 | #define NMI_NONE 0 |
| 69 | #define NMI_IO_APIC 1 | 69 | #define NMI_IO_APIC 1 |
| 70 | #define NMI_LOCAL_APIC 2 | 70 | #define NMI_LOCAL_APIC 2 |