|
@@ -789,6 +789,22 @@ config X86_MCE
|
|
|
to disable it. MCE support simply ignores non-MCE processors like
|
|
|
the 386 and 486, so nearly everyone can say Y here.
|
|
|
|
|
|
+config X86_OLD_MCE
|
|
|
+ depends on X86_32 && X86_MCE
|
|
|
+ bool "Use legacy machine check code (will go away)"
|
|
|
+ default n
|
|
|
+ select X86_ANCIENT_MCE
|
|
|
+ ---help---
|
|
|
+ Use the old i386 machine check code. This is merely intended for
|
|
|
+ testing in a transition period. Try this if you run into any machine
|
|
|
+ check related software problems, but report the problem to
|
|
|
+ linux-kernel. When in doubt say no.
|
|
|
+
|
|
|
+config X86_NEW_MCE
|
|
|
+ depends on X86_MCE
|
|
|
+ bool
|
|
|
+ default y if (!X86_OLD_MCE && X86_32) || X86_64
|
|
|
+
|
|
|
config X86_MCE_INTEL
|
|
|
def_bool y
|
|
|
prompt "Intel MCE features"
|
|
@@ -805,6 +821,15 @@ config X86_MCE_AMD
|
|
|
Additional support for AMD specific MCE features such as
|
|
|
the DRAM Error Threshold.
|
|
|
|
|
|
+config X86_ANCIENT_MCE
|
|
|
+ def_bool n
|
|
|
+ depends on X86_32
|
|
|
+ prompt "Support for old Pentium 5 / WinChip machine checks"
|
|
|
+ ---help---
|
|
|
+ Include support for machine check handling on old Pentium 5 or WinChip
|
|
|
+ systems. These typically need to be enabled explicitely on the command
|
|
|
+ line.
|
|
|
+
|
|
|
config X86_MCE_THRESHOLD
|
|
|
depends on X86_MCE_AMD || X86_MCE_INTEL
|
|
|
bool
|
|
@@ -812,7 +837,7 @@ config X86_MCE_THRESHOLD
|
|
|
|
|
|
config X86_MCE_NONFATAL
|
|
|
tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
|
|
|
- depends on X86_32 && X86_MCE
|
|
|
+ depends on X86_OLD_MCE
|
|
|
---help---
|
|
|
Enabling this feature starts a timer that triggers every 5 seconds which
|
|
|
will look at the machine check registers to see if anything happened.
|
|
@@ -825,11 +850,15 @@ config X86_MCE_NONFATAL
|
|
|
|
|
|
config X86_MCE_P4THERMAL
|
|
|
bool "check for P4 thermal throttling interrupt."
|
|
|
- depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP)
|
|
|
+ depends on X86_OLD_MCE && X86_MCE && (X86_UP_APIC || SMP)
|
|
|
---help---
|
|
|
Enabling this feature will cause a message to be printed when the P4
|
|
|
enters thermal throttling.
|
|
|
|
|
|
+config X86_THERMAL_VECTOR
|
|
|
+ def_bool y
|
|
|
+ depends on X86_MCE_P4THERMAL || X86_MCE_INTEL
|
|
|
+
|
|
|
config VM86
|
|
|
bool "Enable VM86 support" if EMBEDDED
|
|
|
default y
|