Since we'll be adding multiple trace events to ras.h, we need to protect each block appropriately so that they only get included in the right places. Update PCIe AER trace event for this purpose. Signed-off-by: Naveen N. Rao <naveen.n.rao@xxxxxxxxxxxxxxxxxx> --- drivers/pci/pcie/aer/aerdrv_errprint.c | 1 + include/trace/events/ras.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c index 2c7c9f5..4d06859 100644 --- a/drivers/pci/pcie/aer/aerdrv_errprint.c +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c @@ -24,6 +24,7 @@ #include "aerdrv.h" #define CREATE_TRACE_POINTS +#define TRACE_EVENT_PCIE_AER #include <trace/events/ras.h> #define AER_AGENT_RECEIVER 0 diff --git a/include/trace/events/ras.h b/include/trace/events/ras.h index 88b8783..4a66142 100644 --- a/include/trace/events/ras.h +++ b/include/trace/events/ras.h @@ -1,7 +1,7 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM ras -#if !defined(_TRACE_AER_H) || defined(TRACE_HEADER_MULTI_READ) +#if (!defined(_TRACE_AER_H) || defined(TRACE_HEADER_MULTI_READ)) && defined(TRACE_EVENT_PCIE_AER) #define _TRACE_AER_H #include <linux/tracepoint.h> -- 1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
