diff options
author | Don Zickus <dzickus@redhat.com> | 2006-09-26 04:52:27 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:27 -0400 |
commit | 8da5adda91df3d2fcc5300e68da491694c9af019 (patch) | |
tree | bae152dabd728ba2f7fead421276e3cc9a779141 /include | |
parent | e33e89ab1a8d295de0500b697f4f31c3ceee9aa2 (diff) |
[PATCH] x86: Allow users to force a panic on NMI
To quote Alan Cox:
The default Linux behaviour on an NMI of either memory or unknown is to
continue operation. For many environments such as scientific computing
it is preferable that the box is taken out and the error dealt with than
an uncorrected parity/ECC error get propogated.
A small number of systems do generate NMI's for bizarre random reasons
such as power management so the default is unchanged. In other respects
the new proc/sys entry works like the existing panic controls already in
that directory.
This is separate to the edac support - EDAC allows supported chipsets to
handle ECC errors well, this change allows unsupported cases to at least
panic rather than cause problems further down the line.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/kernel.h | 1 | ||||
-rw-r--r-- | include/linux/sysctl.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 2b2ae4fdce8..1ff9609300b 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -186,6 +186,7 @@ extern void bust_spinlocks(int yes); | |||
186 | extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ | 186 | extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */ |
187 | extern int panic_timeout; | 187 | extern int panic_timeout; |
188 | extern int panic_on_oops; | 188 | extern int panic_on_oops; |
189 | extern int panic_on_unrecovered_nmi; | ||
189 | extern int tainted; | 190 | extern int tainted; |
190 | extern const char *print_tainted(void); | 191 | extern const char *print_tainted(void); |
191 | extern void add_taint(unsigned); | 192 | extern void add_taint(unsigned); |
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index ecb79ba52ae..432778446ad 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -151,6 +151,7 @@ enum | |||
151 | KERN_COMPAT_LOG=73, /* int: print compat layer messages */ | 151 | KERN_COMPAT_LOG=73, /* int: print compat layer messages */ |
152 | KERN_MAX_LOCK_DEPTH=74, | 152 | KERN_MAX_LOCK_DEPTH=74, |
153 | KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */ | 153 | KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */ |
154 | KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ | ||
154 | }; | 155 | }; |
155 | 156 | ||
156 | 157 | ||