On Mon, Apr 13, 2015 at 12:07:27PM -0400, Steven Rostedt wrote: > TRACE_SYSTEM_STRING is defined in mei-trace.h but is unused. Worse yet, > the ftrace tracing infrastructure is using it now and this causes > warnings about redefined macros. > > Remove the define of TRACE_SYSTEM_STRING from mei-trace.h > > Link: http://lkml.kernel.org/r/20150413193720.56083fbf@xxxxxxxxxxxxxxxx > > Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> > --- > diff --git a/drivers/misc/mei/mei-trace.h b/drivers/misc/mei/mei-trace.h > index 5f4e1a17360b..c9e24d2b698a 100644 > --- a/drivers/misc/mei/mei-trace.h > +++ b/drivers/misc/mei/mei-trace.h > @@ -26,7 +26,6 @@ > #undef TRACE_SYSTEM > > #define TRACE_SYSTEM mei > -#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > > TRACE_EVENT(mei_reg_read, > TP_PROTO(const struct device *dev, const char *reg, u32 offs, u32 val), This is already in my tree, and will show up in the next linux-next :) thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
