1 files changed, 1 insertions, 28 deletions

diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index f5e37f32c71f..06e9b411a0a2 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -36,7 +36,6 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <acpi/apei.h>
-#include <asm/mce.h>
 
 #include "apei-internal.h"
 
@@ -128,33 +127,7 @@ EXPORT_SYMBOL_GPL(apei_hest_parse);
  */
 static int __init hest_parse_cmc(struct acpi_hest_header *hest_hdr, void *data)
 {
-#ifdef CONFIG_X86_MCE
-        int i;
-        struct acpi_hest_ia_corrected *cmc;
-        struct acpi_hest_ia_error_bank *mc_bank;
-
-        if (hest_hdr->type != ACPI_HEST_TYPE_IA32_CORRECTED_CHECK)
-                return 0;
-
-        cmc = (struct acpi_hest_ia_corrected *)hest_hdr;
-        if (!cmc->enabled)
-                return 0;
-
-        /*
-         * We expect HEST to provide a list of MC banks that report errors
-         * in firmware first mode. Otherwise, return non-zero value to
-         * indicate that we are done parsing HEST.
-         */
-        if (!(cmc->flags & ACPI_HEST_FIRMWARE_FIRST) || !cmc->num_hardware_banks)
-                return 1;
-
-        pr_info(HEST_PFX "Enabling Firmware First mode for corrected errors.\n");
-
-        mc_bank = (struct acpi_hest_ia_error_bank *)(cmc + 1);
-        for (i = 0; i < cmc->num_hardware_banks; i++, mc_bank++)
-                mce_disable_bank(mc_bank->bank_number);
-#endif
-        return 1;
+        return arch_apei_enable_cmcff(hest_hdr, data);
 }
 
 struct ghes_arr {