aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig11
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d986769a7d90..06880ca677f4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -781,15 +781,10 @@ config X86_MCE
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 warning messages to halting the machine. 782 ranging from warning messages to halting the machine.
783 783
784config X86_NEW_MCE
785 depends on X86_MCE
786 bool
787 default y
788
789config X86_MCE_INTEL 784config X86_MCE_INTEL
790 def_bool y 785 def_bool y
791 prompt "Intel MCE features" 786 prompt "Intel MCE features"
792 depends on X86_NEW_MCE && X86_LOCAL_APIC 787 depends on X86_MCE && X86_LOCAL_APIC
793 ---help--- 788 ---help---
794 Additional support for intel specific MCE features such as 789 Additional support for intel specific MCE features such as
795 the thermal monitor. 790 the thermal monitor.
@@ -797,7 +792,7 @@ config X86_MCE_INTEL
797config X86_MCE_AMD 792config X86_MCE_AMD
798 def_bool y 793 def_bool y
799 prompt "AMD MCE features" 794 prompt "AMD MCE features"
800 depends on X86_NEW_MCE && X86_LOCAL_APIC 795 depends on X86_MCE && X86_LOCAL_APIC
801 ---help--- 796 ---help---
802 Additional support for AMD specific MCE features such as 797 Additional support for AMD specific MCE features such as
803 the DRAM Error Threshold. 798 the DRAM Error Threshold.
@@ -817,7 +812,7 @@ config X86_MCE_THRESHOLD
817 default y 812 default y
818 813
819config X86_MCE_INJECT 814config X86_MCE_INJECT
820 depends on X86_NEW_MCE 815 depends on X86_MCE
821 tristate "Machine check injector support" 816 tristate "Machine check injector support"
822 ---help--- 817 ---help---
823 Provide support for injecting machine checks for testing purposes. 818 Provide support for injecting machine checks for testing purposes.