summaryrefslogtreecommitdiff
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-05 23:49:25 +0300
committerIngo Molnar <mingo@elte.hu>2009-03-05 23:49:25 +0300
commitcaab36b593b44c97e3c7707c6a8054b320f8d622 (patch)
tree70c8d67d51c616c357529d761a82ad382481dad7 /arch/x86/Kconfig
parenta1413c89ae6a4b7a9a43f7768934a81ffb5c629a (diff)
parent73af76dfd1f998dba71d8e8e785cbe77a990bf17 (diff)
downloadlinux-caab36b593b44c97e3c7707c6a8054b320f8d622.tar.xz
Merge branch 'x86/mce2' into x86/core
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f5cef3fbf9a5..31758378bcd2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -783,6 +783,11 @@ config X86_MCE_AMD
Additional support for AMD specific MCE features such as
the DRAM Error Threshold.
+config X86_MCE_THRESHOLD
+ depends on X86_MCE_AMD || X86_MCE_INTEL
+ bool
+ default y
+
config X86_MCE_NONFATAL
tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
depends on X86_32 && X86_MCE