x86, mce: Add boot options for corrected errors

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / cpu / mcheck / mce_intel_64.c

diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
index eff3740501a36c3abcf0fa5c3d7fe1b39cef5edc..046087e9808f1a88584b292db9bdf9c603bc723e 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
@@ -57,6 +57,9 @@ static int cmci_supported(int *banks)
 {
        u64 cap;
 
+       if (mce_cmci_disabled || mce_ignore_ce)
+               return 0;
+
        /*
         * Vendor check is not strictly needed, but the initial
         * initialization is vendor keyed and this
@@ -80,7 +83,7 @@ static int cmci_supported(int *banks)
 static void intel_threshold_interrupt(void)
 {
        machine_check_poll(MCP_TIMESTAMP, &__get_cpu_var(mce_banks_owned));
-       mce_notify_user();
+       mce_notify_irq();
 }
 
 static void print_update(char *type, int *hdr, int num)