* linux-next: build warnings after merge of the char-misc tree
@ 2015-04-13 9:37 Stephen Rothwell
2015-04-13 10:43 ` Greg KH
2015-04-13 13:34 ` linux-next: build warnings after merge of the char-misc tree Greg KH
0 siblings, 2 replies; 9+ messages in thread
From: Stephen Rothwell @ 2015-04-13 9:37 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Steven Rostedt
Cc: linux-next, linux-kernel, Tomas Winkler
[-- Attachment #1: Type: text/plain, Size: 3166 bytes --]
Hi all,
After merging the char-misc tree, today's linux-next build (x86_64
allmodconfig) produced these warnings:
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: warning: "TRACE_SYSTEM_STRING" redefined
#define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
^
In file included from include/trace/define_trace.h:83:0,
from drivers/misc/mei/mei-trace.h:76,
from drivers/misc/mei/mei-trace.c:21:
drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition
#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
^
In file included from include/trace/ftrace.h:134:0,
from include/trace/define_trace.h:90,
from drivers/misc/mei/mei-trace.h:76,
from drivers/misc/mei/mei-trace.c:21:
drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined
#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
^
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)
^
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: warning: "TRACE_SYSTEM_STRING" redefined
#define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name)
^
In file included from include/trace/define_trace.h:83:0,
from drivers/misc/mei/mei-trace.h:76,
from drivers/misc/mei/mei-trace.c:21:
drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition
#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
^
In file included from include/trace/ftrace.h:134:0,
from include/trace/define_trace.h:90,
from drivers/misc/mei/mei-trace.h:76,
from drivers/misc/mei/mei-trace.c:21:
drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined
#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
^
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: linux-next: build warnings after merge of the char-misc tree 2015-04-13 9:37 linux-next: build warnings after merge of the char-misc tree Stephen Rothwell @ 2015-04-13 10:43 ` Greg KH 2015-04-13 10:44 ` Winkler, Tomas ` (4 more replies) 2015-04-13 13:34 ` linux-next: build warnings after merge of the char-misc tree Greg KH 1 sibling, 5 replies; 9+ messages in thread From: Greg KH @ 2015-04-13 10:43 UTC (permalink / raw) To: Stephen Rothwell Cc: Arnd Bergmann, Steven Rostedt, linux-next, linux-kernel, Tomas Winkler On Mon, Apr 13, 2015 at 07:37:20PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) produced these warnings: > > 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: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) > ^ > In file included from include/trace/define_trace.h:83:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > In file included from include/trace/ftrace.h:134:0, > from include/trace/define_trace.h:90, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > 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) > ^ > 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: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) > ^ > In file included from include/trace/define_trace.h:83:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > In file included from include/trace/ftrace.h:134:0, > from include/trace/define_trace.h:90, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > 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 :( Anyway, someone from the trace subsystem wish to send me a patch for this? thanks, greg k-h ^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: linux-next: build warnings after merge of the char-misc tree 2015-04-13 10:43 ` Greg KH @ 2015-04-13 10:44 ` Winkler, Tomas 2015-04-13 10:47 ` Stephen Rothwell ` (3 subsequent siblings) 4 siblings, 0 replies; 9+ messages in thread From: Winkler, Tomas @ 2015-04-13 10:44 UTC (permalink / raw) To: Greg KH, Stephen Rothwell Cc: Arnd Bergmann, Steven Rostedt, linux-next@vger•kernel.org, linux-kernel@vger•kernel.org > -----Original Message----- > From: Greg KH [mailto:greg@kroah•com] > Sent: Monday, April 13, 2015 13:43 > To: Stephen Rothwell > Cc: Arnd Bergmann; Steven Rostedt; linux-next@vger•kernel.org; linux- > kernel@vger•kernel.org; Winkler, Tomas > Subject: Re: linux-next: build warnings after merge of the char-misc tree > > On Mon, Apr 13, 2015 at 07:37:20PM +1000, Stephen Rothwell wrote: > > Hi all, > > > > After merging the char-misc tree, today's linux-next build (x86_64 > > allmodconfig) produced these warnings: > > > > 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: warning: "TRACE_SYSTEM_STRING" redefined > > #define TRACE_SYSTEM_STRING > __app(TRACE_SYSTEM_VAR,__trace_system_name) > > ^ > > In file included from include/trace/define_trace.h:83:0, > > from drivers/misc/mei/mei-trace.h:76, > > from drivers/misc/mei/mei-trace.c:21: > > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous > definition > > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > > ^ > > In file included from include/trace/ftrace.h:134:0, > > from include/trace/define_trace.h:90, > > from drivers/misc/mei/mei-trace.h:76, > > from drivers/misc/mei/mei-trace.c:21: > > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" > redefined > > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > > ^ > > 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) > > ^ > > 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: warning: "TRACE_SYSTEM_STRING" redefined > > #define TRACE_SYSTEM_STRING > __app(TRACE_SYSTEM_VAR,__trace_system_name) > > ^ > > In file included from include/trace/define_trace.h:83:0, > > from drivers/misc/mei/mei-trace.h:76, > > from drivers/misc/mei/mei-trace.c:21: > > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous > definition > > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > > ^ > > In file included from include/trace/ftrace.h:134:0, > > from include/trace/define_trace.h:90, > > from drivers/misc/mei/mei-trace.h:76, > > from drivers/misc/mei/mei-trace.c:21: > > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" > redefined > > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > > ^ > > 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 :( > > Anyway, someone from the trace subsystem wish to send me a patch for > this? > > thanks, Will send in few Tomas ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build warnings after merge of the char-misc tree 2015-04-13 10:43 ` Greg KH 2015-04-13 10:44 ` Winkler, Tomas @ 2015-04-13 10:47 ` Stephen Rothwell 2015-04-13 14:17 ` Steven Rostedt ` (2 subsequent siblings) 4 siblings, 0 replies; 9+ messages in thread From: Stephen Rothwell @ 2015-04-13 10:47 UTC (permalink / raw) To: Greg KH Cc: Arnd Bergmann, Steven Rostedt, linux-next, linux-kernel, Tomas Winkler [-- Attachment #1: Type: text/plain, Size: 336 bytes --] Hi Greg, On Mon, 13 Apr 2015 12:43:28 +0200 Greg KH <greg@kroah•com> wrote: > > That's nice for such system-wide changes to be done at the last possible > minute in the development cycle :( Tell me about it - its 20:46 here and I'm not done yet :-( -- Cheers, Stephen Rothwell sfr@canb•auug.org.au \ [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build warnings after merge of the char-misc tree 2015-04-13 10:43 ` Greg KH 2015-04-13 10:44 ` Winkler, Tomas 2015-04-13 10:47 ` Stephen Rothwell @ 2015-04-13 14:17 ` Steven Rostedt 2015-04-13 15:01 ` Steven Rostedt 2015-04-13 16:07 ` [PATCH] mei: trace: Remove unused TRACE_SYSTEM_STRING define Steven Rostedt 4 siblings, 0 replies; 9+ messages in thread From: Steven Rostedt @ 2015-04-13 14:17 UTC (permalink / raw) To: Greg KH Cc: Stephen Rothwell, Arnd Bergmann, linux-next, linux-kernel, Tomas Winkler On Mon, 13 Apr 2015 12:43:28 +0200 Greg KH <greg@kroah•com> wrote: ^ > > > > 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 :( Hmm, sorry. I'll try to figure out what happened. A lot of this was done earlier, but I was waiting for acks an also making sure it worked, and doing lots of iterations of testing. Unfortunately, I only tested against what was in mainline, not what was in linux-next. I should have done that too. > > Anyway, someone from the trace subsystem wish to send me a patch for > this? > I'll download latest linux-next and take a look at the carnage. This is something that may break builds, but is pretty straight forward that shouldn't cause anything serious to break at run time. -- Steve ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build warnings after merge of the char-misc tree 2015-04-13 10:43 ` Greg KH ` (2 preceding siblings ...) 2015-04-13 14:17 ` Steven Rostedt @ 2015-04-13 15:01 ` Steven Rostedt 2015-04-13 16:07 ` [PATCH] mei: trace: Remove unused TRACE_SYSTEM_STRING define Steven Rostedt 4 siblings, 0 replies; 9+ messages in thread From: Steven Rostedt @ 2015-04-13 15:01 UTC (permalink / raw) To: Greg KH Cc: Stephen Rothwell, Arnd Bergmann, linux-next, linux-kernel, Tomas Winkler On Mon, 13 Apr 2015 12:43:28 +0200 Greg KH <greg@kroah•com> 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] mei: trace: Remove unused TRACE_SYSTEM_STRING define 2015-04-13 10:43 ` Greg KH ` (3 preceding siblings ...) 2015-04-13 15:01 ` Steven Rostedt @ 2015-04-13 16:07 ` Steven Rostedt 2015-04-13 16:56 ` Greg KH 4 siblings, 1 reply; 9+ messages in thread From: Steven Rostedt @ 2015-04-13 16:07 UTC (permalink / raw) To: Greg KH Cc: Stephen Rothwell, Arnd Bergmann, linux-next, linux-kernel, Tomas Winkler 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@canb.auug.org.au Reported-by: Stephen Rothwell <sfr@canb•auug.org.au> Signed-off-by: Steven Rostedt <rostedt@goodmis•org> --- 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), ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] mei: trace: Remove unused TRACE_SYSTEM_STRING define 2015-04-13 16:07 ` [PATCH] mei: trace: Remove unused TRACE_SYSTEM_STRING define Steven Rostedt @ 2015-04-13 16:56 ` Greg KH 0 siblings, 0 replies; 9+ messages in thread From: Greg KH @ 2015-04-13 16:56 UTC (permalink / raw) To: Steven Rostedt Cc: Stephen Rothwell, Arnd Bergmann, linux-next, linux-kernel, Tomas Winkler 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@canb.auug.org.au > > Reported-by: Stephen Rothwell <sfr@canb•auug.org.au> > Signed-off-by: Steven Rostedt <rostedt@goodmis•org> > --- > 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 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: build warnings after merge of the char-misc tree 2015-04-13 9:37 linux-next: build warnings after merge of the char-misc tree Stephen Rothwell 2015-04-13 10:43 ` Greg KH @ 2015-04-13 13:34 ` Greg KH 1 sibling, 0 replies; 9+ messages in thread From: Greg KH @ 2015-04-13 13:34 UTC (permalink / raw) To: Stephen Rothwell Cc: Arnd Bergmann, Steven Rostedt, linux-next, linux-kernel, Tomas Winkler On Mon, Apr 13, 2015 at 07:37:20PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) produced these warnings: > > 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: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) > ^ > In file included from include/trace/define_trace.h:83:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > In file included from include/trace/ftrace.h:134:0, > from include/trace/define_trace.h:90, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > 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) > ^ > 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: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) > ^ > In file included from include/trace/define_trace.h:83:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > In file included from include/trace/ftrace.h:134:0, > from include/trace/define_trace.h:90, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > 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. Now removed, thanks. greg k-h ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-04-13 16:56 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-04-13 9:37 linux-next: build warnings after merge of the char-misc tree Stephen Rothwell 2015-04-13 10:43 ` Greg KH 2015-04-13 10:44 ` Winkler, Tomas 2015-04-13 10:47 ` Stephen Rothwell 2015-04-13 14:17 ` Steven Rostedt 2015-04-13 15:01 ` Steven Rostedt 2015-04-13 16:07 ` [PATCH] mei: trace: Remove unused TRACE_SYSTEM_STRING define Steven Rostedt 2015-04-13 16:56 ` Greg KH 2015-04-13 13:34 ` linux-next: build warnings after merge of the char-misc tree Greg KH
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox