diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-01 05:45:41 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-01 05:45:41 +0200 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /arch/x86_64/kernel/nmi.c | |
| parent | Merge branch 'master' into upstream (diff) | |
| parent | [PATCH] SCSI: fix request flag-related build breakage (diff) | |
| download | linux-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.tar.xz linux-1c7da74c4aab595a994beb5fe728ebf0d0b41f59.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/x86_64/kernel/nmi.c')
| -rw-r--r-- | arch/x86_64/kernel/nmi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index 4d6fb047952e..7af9cb3e2d99 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c @@ -28,6 +28,10 @@ #include <asm/mce.h> #include <asm/intel_arch_perfmon.h> +int unknown_nmi_panic; +int nmi_watchdog_enabled; +int panic_on_unrecovered_nmi; + /* 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 |