diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-29 23:47:55 (GMT) |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-29 23:47:55 (GMT) |
| commit | 29cbc78b90a73ad80f2f58ba2927956cf663abed (patch) | |
| tree | e72fdb9c1c055da47b4cd8834bc944af8efc1ed8 /arch/i386 | |
| parent | 013bf2c50ed943e9c23a2145d3ea7c4d88cda310 (diff) | |
| download | linux-fsl-qoriq-29cbc78b90a73ad80f2f58ba2927956cf663abed.tar.xz | |
[PATCH] x86: Clean up x86 NMI sysctls
Use prototypes in headers
Don't define panic_on_unrecovered_nmi for all architectures
Cc: dzickus@redhat.com
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/nmi.c | 3 | ||||
| -rw-r--r-- | arch/i386/kernel/traps.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index dbda706..0fc4997 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c @@ -31,6 +31,9 @@ #include "mach_traps.h" +int unknown_nmi_panic; +int nmi_watchdog_enabled; + /* perfctr_nmi_owner tracks the ownership of the perfctr registers: * evtsel_nmi_owner tracks the ownership of the event selection * - different performance counters/ event selection may be reserved for diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index a13037f..6820b8d 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c @@ -57,6 +57,8 @@ #include "mach_traps.h" +int panic_on_unrecovered_nmi; + asmlinkage int system_call(void); struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, |