File tree Expand file tree Collapse file tree 6 files changed +426
-364
lines changed Expand file tree Collapse file tree 6 files changed +426
-364
lines changed Original file line number Diff line number Diff line change @@ -1043,6 +1043,14 @@ config X86_MCE
10431043 The action the kernel takes depends on the severity of the problem,
10441044 ranging from warning messages to halting the machine.
10451045
1046+ config X86_MCELOG_LEGACY
1047+ bool "Support for deprecated /dev/mcelog character device"
1048+ depends on X86_MCE
1049+ ---help---
1050+ Enable support for /dev/mcelog which is needed by the old mcelog
1051+ userspace logging daemon. Consider switching to the new generation
1052+ rasdaemon solution.
1053+
10461054config X86_MCE_INTEL
10471055 def_bool y
10481056 prompt "Intel MCE features"
@@ -1072,7 +1080,7 @@ config X86_MCE_THRESHOLD
10721080 def_bool y
10731081
10741082config X86_MCE_INJECT
1075- depends on X86_MCE && X86_LOCAL_APIC
1083+ depends on X86_MCE && X86_LOCAL_APIC && X86_MCELOG_LEGACY
10761084 tristate "Machine check injector support"
10771085 ---help---
10781086 Provide support for injecting machine checks for testing purposes.
Original file line number Diff line number Diff line change @@ -196,6 +196,7 @@ enum mce_notifier_prios {
196196 MCE_PRIO_EXTLOG = INT_MAX - 2 ,
197197 MCE_PRIO_NFIT = INT_MAX - 3 ,
198198 MCE_PRIO_EDAC = INT_MAX - 4 ,
199+ MCE_PRIO_MCELOG = 1 ,
199200 MCE_PRIO_LOWEST = 0 ,
200201};
201202
Original file line number Diff line number Diff line change @@ -9,3 +9,5 @@ obj-$(CONFIG_X86_MCE_INJECT) += mce-inject.o
99obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o
1010
1111obj-$(CONFIG_ACPI_APEI) += mce-apei.o
12+
13+ obj-$(CONFIG_X86_MCELOG_LEGACY) += dev-mcelog.o
You can’t perform that action at this time.
0 commit comments