Merge tag 'ras_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/ras

Pull RAS updates from Borislav Petkov:

  * Add the functionality to override error reporting agents as some
  machines are sporting a new extended error logging capability which, if
  done properly in the BIOS, makes a corresponding EDAC module redundant,
  from Gong Chen.

  * PCIe AER tracepoint severity levels fix, from Rui Wang.

  * Error path correction for the mce device init, from Levente Kurusa.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/include/trace/events/ras.h b/include/trace/events/ras.h
index 88b878383797..1c875ad1ee5f 100644
--- a/include/trace/events/ras.h
+++ b/include/trace/events/ras.h
@@ -5,7 +5,7 @@
 #define _TRACE_AER_H
 
 #include <linux/tracepoint.h>
-#include <linux/edac.h>
+#include <linux/aer.h>
 
 
 /*
@@ -63,10 +63,10 @@ TRACE_EVENT(aer_event,
 
         TP_printk("%s PCIe Bus Error: severity=%s, %s\n",
                 __get_str(dev_name),
-                __entry->severity == HW_EVENT_ERR_CORRECTED ? "Corrected" :
-                        __entry->severity == HW_EVENT_ERR_FATAL ?
-                        "Fatal" : "Uncorrected",
-                __entry->severity == HW_EVENT_ERR_CORRECTED ?
+                __entry->severity == AER_CORRECTABLE ? "Corrected" :
+                        __entry->severity == AER_FATAL ?
+                        "Fatal" : "Uncorrected, non-fatal",
+                __entry->severity == AER_CORRECTABLE ?
                 __print_flags(__entry->status, "|", aer_correctable_errors) :
                 __print_flags(__entry->status, "|", aer_uncorrectable_errors))
 );