diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:49:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:49:25 +0100 |
| commit | caab36b593b44c97e3c7707c6a8054b320f8d622 (patch) | |
| tree | 70c8d67d51c616c357529d761a82ad382481dad7 /arch/x86/Kconfig | |
| parent | Merge branch 'x86/urgent' into x86/core (diff) | |
| parent | x86, mce: fix build failure in arch/x86/kernel/cpu/mcheck/threshold.c (diff) | |
| download | linux-caab36b593b44c97e3c7707c6a8054b320f8d622.tar.xz linux-caab36b593b44c97e3c7707c6a8054b320f8d622.zip | |
Merge branch 'x86/mce2' into x86/core
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 5 |
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 |