aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2009-07-08 18:31:38 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-07-09 21:39:46 -0400
commitbab9bc6583fe6c1660d6ed36dd14bbb4edfaf393 (patch)
tree6b2125ecc71e3d4d24265c20100b404349b9403e /arch/x86
parentc31d96338a6041520ba5f1b6a4a5012ef00686b3 (diff)
x86: mce: Update X86_MCE description in x86/Kconfig
- Clarify that this config controls thermal throttling reporting too - Clarify the types of errors reported by machine checks - Drop references to ancient CPUs. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig16
1 files changed, 4 insertions, 12 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5962b872a7ad..134a8c0d80dd 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -774,20 +774,12 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
774 increased on these systems. 774 increased on these systems.
775 775
776config X86_MCE 776config X86_MCE
777 bool "Machine Check Exception" 777 bool "Machine Check / overheating reporting"
778 ---help--- 778 ---help---
779 Machine Check Exception support allows the processor to notify the 779 Machine Check support allows the processor to notify the
780 kernel if it detects a problem (e.g. overheating, component failure). 780 kernel if it detects a problem (e.g. overheating, data corruption).
781 The action the kernel takes depends on the severity of the problem, 781 The action the kernel takes depends on the severity of the problem,
782 ranging from a warning message on the console, to halting the machine. 782 ranging from warning messages to halting the machine.
783 Your processor must be a Pentium or newer to support this - check the
784 flags in /proc/cpuinfo for mce. Note that some older Pentium systems
785 have a design flaw which leads to false MCE events - hence MCE is
786 disabled on all P5 processors, unless explicitly enabled with "mce"
787 as a boot argument. Similarly, if MCE is built in and creates a
788 problem on some new non-standard machine, you can boot with "nomce"
789 to disable it. MCE support simply ignores non-MCE processors like
790 the 386 and 486, so nearly everyone can say Y here.
791 783
792config X86_OLD_MCE 784config X86_OLD_MCE
793 depends on X86_32 && X86_MCE 785 depends on X86_32 && X86_MCE