From a722d9c207333dd31f571d69265e1dfadc921250 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Thu, 9 Jul 2009 00:31:38 +0200 Subject: [PATCH] --- yaml --- r: 163031 b: refs/heads/master c: bab9bc6583fe6c1660d6ed36dd14bbb4edfaf393 h: refs/heads/master i: 163029: d7453e57b61f88f7c9527c60d3831b792866f1a6 163027: c1beb5933bf194d7a2be494194dabdf18e885840 163023: 4c2008ecc01b3029d87eae6556f91409912a7921 v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 58dde5a76e1a..77ad0a6a5a6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c31d96338a6041520ba5f1b6a4a5012ef00686b3 +refs/heads/master: bab9bc6583fe6c1660d6ed36dd14bbb4edfaf393 diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 5962b872a7ad..134a8c0d80dd 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -774,20 +774,12 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS increased on these systems. config X86_MCE - bool "Machine Check Exception" + bool "Machine Check / overheating reporting" ---help--- - Machine Check Exception support allows the processor to notify the - kernel if it detects a problem (e.g. overheating, component failure). + Machine Check support allows the processor to notify the + kernel if it detects a problem (e.g. overheating, data corruption). The action the kernel takes depends on the severity of the problem, - ranging from a warning message on the console, to halting the machine. - Your processor must be a Pentium or newer to support this - check the - flags in /proc/cpuinfo for mce. Note that some older Pentium systems - have a design flaw which leads to false MCE events - hence MCE is - disabled on all P5 processors, unless explicitly enabled with "mce" - as a boot argument. Similarly, if MCE is built in and creates a - problem on some new non-standard machine, you can boot with "nomce" - to disable it. MCE support simply ignores non-MCE processors like - the 386 and 486, so nearly everyone can say Y here. + ranging from warning messages to halting the machine. config X86_OLD_MCE depends on X86_32 && X86_MCE