On Mon, 13 Apr 2015 12:43:28 +0200 Greg KH <greg@xxxxxxxxx> wrote: > > In file included from include/trace/define_trace.h:90:0, > > from drivers/misc/mei/mei-trace.h:76, > > from drivers/misc/mei/mei-trace.c:21: > > include/trace/ftrace.h:28:0: note: this is the location of the previous definition > > #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) > > ^ > > > > Introduced by commit a0a927d06d79 ("mei: me: add io register tracing") > > interacting with commit acd388fd3af3 ("tracing: Give system name a > > pointer") from the ftrace tree. > > > > TRACE_SYSTEM_STRING should be removed from drivers/misc/mei/mei-trace.h > > as it is not being used anywhere in the mei-trace code. > > That's nice for such system-wide changes to be done at the last possible > minute in the development cycle :( > Looking at this deeper, this commit isn't a problem with the trace system change. It is caused probably by a cut and paste from a driver that had TRACE_SYSTEM_STRING and should not have. A simple removal of this define should be enough to fix the issue. -- Steve -- 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