diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-07-14 09:26:47 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-07-14 09:27:25 -0700 |
| commit | cbd4ebcba16c31abc341e1810e6e0fb4c35117b3 (patch) | |
| tree | 49a3b54c709d11efbee631a85cca5fb550515005 /drivers/pci | |
| parent | 27c934158c5be0bebfb2970da521b9d9efc0058b (diff) | |
| parent | 7c76bb5f7a3d052339b873374333dd0dcc35ce28 (diff) | |
Merge tag 'please-pull-extlog-trace' into x86/ras
Report extended error information ("extlog") using
a trace/event. Provide a mechanism for a smart
daemon collecting this information to tell the kernel
to skip logging corrected errors to the console.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pcie/aer/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/pci/pcie/aer/aerdrv_errprint.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pcie/aer/Kconfig b/drivers/pci/pcie/aer/Kconfig index 50e94e02378a..389440228c1d 100644 --- a/drivers/pci/pcie/aer/Kconfig +++ b/drivers/pci/pcie/aer/Kconfig @@ -5,6 +5,7 @@ config PCIEAER boolean "Root Port Advanced Error Reporting support" depends on PCIEPORTBUS + select RAS default y help This enables PCI Express Root Port Advanced Error Reporting diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c index 36ed31b52198..35d06e177917 100644 --- a/drivers/pci/pcie/aer/aerdrv_errprint.c +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c @@ -22,9 +22,7 @@ #include <linux/cper.h> #include "aerdrv.h" - -#define CREATE_TRACE_POINTS -#include <trace/events/ras.h> +#include <ras/ras_event.h> #define AER_AGENT_RECEIVER 0 #define AER_AGENT_REQUESTER 1 |