From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754162AbZCJK4n (ORCPT ); Tue, 10 Mar 2009 06:56:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753858AbZCJK4d (ORCPT ); Tue, 10 Mar 2009 06:56:33 -0400 Received: from mail-ew0-f177.google.com ([209.85.219.177]:53487 "EHLO mail-ew0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753473AbZCJK4c (ORCPT ); Tue, 10 Mar 2009 06:56:32 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=EjV8RscHoQ0Fu3/e0bpmV8UM+PxwslsS2Nsh1wdOlxNcQKmHAiixWBqrtVEWJHYHFv idiwPtaRaPdRx68xsw4igPGrj6uib59WrwD78s+EJ0c5qkGlCCsOY/wW4E3ZqC8bod+c MRkH8e9VBMGWWc9SNc26gbs+NQV3JDMYYiBBQ= Date: Tue, 10 Mar 2009 11:56:25 +0100 From: Frederic Weisbecker To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Andrew Morton , Thomas Gleixner , Peter Zijlstra , Theodore Tso , Arnaldo Carvalho de Melo , "H. Peter Anvin" , Mathieu Desnoyers , Lai Jiangshan , "Martin J. Bligh" , "Frank Ch. Eigler" , KOSAKI Motohiro , Larry Woodman , Jason Baron , Tom Zanussi , Masami Hiramatsu , Christoph Hellwig , Jiaying Zhang , Steven Rostedt Subject: Re: [PATCH 3/7] tracing: use generic __stringify Message-ID: <20090310105624.GD6825@nowhere> References: <20090310045710.286915983@goodmis.org> <20090310045811.084130677@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090310045811.084130677@goodmis.org> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 10, 2009 at 12:57:13AM -0400, Steven Rostedt wrote: > From: Steven Rostedt > > Impact: clean up > > This removes the custom made STR(x) macros in the tracer and uses > the generic __stringify macro instead. > > Signed-off-by: Steven Rostedt > --- Hi, Why not simply use the # ? Frederic. > kernel/trace/events.c | 4 +--- > kernel/trace/trace_events_stage_3.h | 4 ++-- > kernel/trace/trace_selftest.c | 6 ++---- > 3 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/kernel/trace/events.c b/kernel/trace/events.c > index f2509cb..9fc918d 100644 > --- a/kernel/trace/events.c > +++ b/kernel/trace/events.c > @@ -2,9 +2,7 @@ > * This is the place to register all trace points as events. > */ > > -/* someday this needs to go in a generic header */ > -#define __STR(x) #x > -#define STR(x) __STR(x) > +#include > > #include > > diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h > index 557ca52..41b82b9 100644 > --- a/kernel/trace/trace_events_stage_3.h > +++ b/kernel/trace/trace_events_stage_3.h > @@ -139,7 +139,7 @@ static struct ftrace_event_call __used \ > __attribute__((__aligned__(4))) \ > __attribute__((section("_ftrace_events"))) event_##call = { \ > .name = #call, \ > - .system = STR(TRACE_SYSTEM), \ > + .system = __stringify(TRACE_SYSTEM), \ > .regfunc = ftrace_reg_event_##call, \ > .unregfunc = ftrace_unreg_event_##call, \ > } > @@ -225,7 +225,7 @@ static struct ftrace_event_call __used \ > __attribute__((__aligned__(4))) \ > __attribute__((section("_ftrace_events"))) event_##call = { \ > .name = #call, \ > - .system = STR(TRACE_SYSTEM), \ > + .system = __stringify(TRACE_SYSTEM), \ > .regfunc = ftrace_reg_event_##call, \ > .unregfunc = ftrace_unreg_event_##call, \ > .raw_init = ftrace_raw_init_event_##call, \ > diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c > index 7238646..f907a2b 100644 > --- a/kernel/trace/trace_selftest.c > +++ b/kernel/trace/trace_selftest.c > @@ -1,5 +1,6 @@ > /* Include in trace.c */ > > +#include > #include > #include > > @@ -100,9 +101,6 @@ static inline void warn_failed_init_tracer(struct tracer *trace, int init_ret) > > #ifdef CONFIG_DYNAMIC_FTRACE > > -#define __STR(x) #x > -#define STR(x) __STR(x) > - > /* Test dynamic code modification and ftrace filters */ > int trace_selftest_startup_dynamic_tracing(struct tracer *trace, > struct trace_array *tr, > @@ -130,7 +128,7 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace, > * start of the function names. We simply put a '*' to > * accommodate them. > */ > - func_name = "*" STR(DYN_FTRACE_TEST_NAME); > + func_name = "*" __stringify(DYN_FTRACE_TEST_NAME); > > /* filter only on our function */ > ftrace_set_filter(func_name, strlen(func_name), 1); > -- > 1.6.1.3 > > --