From: Nikolay Borisov <nik.borisov@xxxxxxxx>
Sent: Wednesday, January 15, 2025 3:37 PM
To: linux-edac@xxxxxxxxxxxxxxx
Cc: x86@xxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; bp@xxxxxxxxx; Nikolay
Borisov <nik.borisov@xxxxxxxx>
Subject: [RESEND PATCH 3/3] x86/mce: Make mce_notify_irq() depend on
CONFIG_X86_MCELOG_LEGACY
mce_notify_irq() really depends on the legacy mcelog being enabled as
otherwise mce_work_trigger() will never schedule the trigger work as
mce_helper can't be set unless CONFIG_X86_MCELOG_LEGACY is defined.
Signed-off-by: Nikolay Borisov <nik.borisov@xxxxxxxx>
---
arch/x86/kernel/cpu/mce/core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 89625ff79c3b..b21aa1494da0 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -591,6 +591,7 @@ EXPORT_SYMBOL_GPL(mce_is_correctable);
*/
static int mce_notify_irq(void)
{
+#ifdef CONFIG_X86_MCELOG_LEGACY
/* Not more than two messages every minute */
static DEFINE_RATELIMIT_STATE(ratelimit, 60*HZ, 2);
@@ -602,7 +603,7 @@ static int mce_notify_irq(void)
The message printed inside this function should not depend on
CONFIG_X86_MCELOG_LEGACY. User-space tools/scripts might look for this
message to detect machine events. It is also useful for debugging purposes.
if (__ratelimit(&ratelimit))
pr_info(HW_ERR "Machine check events logged\n");
return 1;
}
-
+#endif
return 0;
}
--
2.43.0