To avoid the confuision of usage for RAS related trace event, add an unified RAS trace event stub. Signed-off-by: Chen, Gong <gong.chen@xxxxxxxxxxxxxxx> --- drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/edac/edac_mc.c | 3 --- drivers/ras/Kconfig | 4 ++++ drivers/ras/Makefile | 1 + drivers/ras/ras-traces.c | 12 ++++++++++++ 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 drivers/ras/Kconfig create mode 100644 drivers/ras/Makefile create mode 100644 drivers/ras/ras-traces.c diff --git a/drivers/Kconfig b/drivers/Kconfig index b3138fb..d70f7ba 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -170,4 +170,6 @@ source "drivers/phy/Kconfig" source "drivers/powercap/Kconfig" +source "drivers/ras/Kconfig" + endmenu diff --git a/drivers/Makefile b/drivers/Makefile index 8e3b8b0..10aaab0 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -155,3 +155,4 @@ obj-$(CONFIG_IPACK_BUS) += ipack/ obj-$(CONFIG_NTB) += ntb/ obj-$(CONFIG_FMC) += fmc/ obj-$(CONFIG_POWERCAP) += powercap/ +obj-$(CONFIG_RAS_TRACE) += ras/ diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 33edd67..28c1695 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -33,9 +33,6 @@ #include <asm/edac.h> #include "edac_core.h" #include "edac_module.h" - -#define CREATE_TRACE_POINTS -#define TRACE_INCLUDE_PATH ../../include/ras #include <ras/ras_event.h> /* lock to memory controller's control array */ diff --git a/drivers/ras/Kconfig b/drivers/ras/Kconfig new file mode 100644 index 0000000..6e4aec5 --- /dev/null +++ b/drivers/ras/Kconfig @@ -0,0 +1,4 @@ +# RAS_TRACE always gets selected by whoever wants it. +config RAS_TRACE + def_bool y + depends on EDAC_MM_EDAC diff --git a/drivers/ras/Makefile b/drivers/ras/Makefile new file mode 100644 index 0000000..826afc6 --- /dev/null +++ b/drivers/ras/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_RAS_TRACE) += ras-traces.o diff --git a/drivers/ras/ras-traces.c b/drivers/ras/ras-traces.c new file mode 100644 index 0000000..b0c6ed1 --- /dev/null +++ b/drivers/ras/ras-traces.c @@ -0,0 +1,12 @@ +/* + * Copyright (C) 2014 Intel Corporation + * + * Authors: + * Chen, Gong <gong.chen@xxxxxxxxxxxxxxx> + */ + +#define CREATE_TRACE_POINTS +#define TRACE_INCLUDE_PATH ../../include/ras +#include <ras/ras_event.h> + +EXPORT_TRACEPOINT_SYMBOL_GPL(mc_event); -- 1.9.0 -- 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
