lkml.org 
[lkml]   [2009]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] ftrace: Don't convert function's local variable name in macro


On Wed, 27 May 2009, Zhaolei wrote:

> "call" is a argument of macro, but it is also used as a local variable name of
> function in macro.
> We should keep this local variable name static although it haven't cause
> problem now.
>
> [ Impact: cleanup, no functionality changed ]
>
> Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>

Acked-by: Steven Rostedt <rostedt@goodmis.org>

-- Steve

> ---
> include/trace/ftrace.h | 20 ++++++++++----------
> 1 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
> index edb02bc..6f1218e 100644
> --- a/include/trace/ftrace.h
> +++ b/include/trace/ftrace.h
> @@ -375,19 +375,19 @@ static void ftrace_profile_##call(proto) \
> perf_tpcounter_event(event_##call.id); \
> } \
> \
> -static int ftrace_profile_enable_##call(struct ftrace_event_call *call) \
> +static int ftrace_profile_enable_##call(struct ftrace_event_call *event_call) \
> { \
> int ret = 0; \
> \
> - if (!atomic_inc_return(&call->profile_count)) \
> + if (!atomic_inc_return(&event_call->profile_count)) \
> ret = register_trace_##call(ftrace_profile_##call); \
> \
> return ret; \
> } \
> \
> -static void ftrace_profile_disable_##call(struct ftrace_event_call *call) \
> +static void ftrace_profile_disable_##call(struct ftrace_event_call *event_call)\
> { \
> - if (atomic_add_negative(-1, &call->profile_count)) \
> + if (atomic_add_negative(-1, &event_call->profile_count)) \
> unregister_trace_##call(ftrace_profile_##call); \
> }
>
> @@ -411,9 +411,9 @@ static void ftrace_profile_disable_##call(struct ftrace_event_call *call) \
> #define __array(type, item, len)
>
> #undef __string
> -#define __string(item, src) \
> - __str_offsets.item = __str_size + \
> - offsetof(typeof(*entry), __str_data); \
> +#define __string(item, src) \
> + __str_offsets.item = __str_size + \
> + offsetof(typeof(*entry), __str_data); \
> __str_size += strlen(src) + 1;
>
> #undef __assign_str
> @@ -429,8 +429,8 @@ static struct ftrace_event_call event_##call; \
> \
> static void ftrace_raw_event_##call(proto) \
> { \
> - struct ftrace_str_offsets_##call __maybe_unused __str_offsets; \
> - struct ftrace_event_call *call = &event_##call; \
> + struct ftrace_str_offsets_##call __maybe_unused __str_offsets; \
> + struct ftrace_event_call *event_call = &event_##call; \
> struct ring_buffer_event *event; \
> struct ftrace_raw_##call *entry; \
> unsigned long irq_flags; \
> @@ -451,7 +451,7 @@ static void ftrace_raw_event_##call(proto) \
> \
> assign; \
> \
> - if (!filter_current_check_discard(call, entry, event)) \
> + if (!filter_current_check_discard(event_call, entry, event)) \
> trace_nowake_buffer_unlock_commit(event, irq_flags, pc); \
> } \
> \
> --
> 1.5.5.3
>
>
>


\
 
 \ /
  Last update: 2009-05-27 20:15    [W:0.056 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site