Commit f2aebaee authored by Zhaolei's avatar Zhaolei Committed by Frederic Weisbecker

ftrace: don't convert function's local variable name in macro

"call" is an argument of macro, but it is also used as a local
variable name of function in macro.
We should keep this local variable name distinct from any
CPP macro parameter name if both are in the same macro scope,
although it hasn't caused any problem yet.

[ Impact: robustify macro ]
Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent 5b6045a9
...@@ -397,19 +397,19 @@ static void ftrace_profile_##call(proto) \ ...@@ -397,19 +397,19 @@ static void ftrace_profile_##call(proto) \
perf_tpcounter_event(event_##call.id); \ 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; \ 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); \ ret = register_trace_##call(ftrace_profile_##call); \
\ \
return ret; \ 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); \ unregister_trace_##call(ftrace_profile_##call); \
} }
...@@ -452,7 +452,7 @@ static struct ftrace_event_call event_##call; \ ...@@ -452,7 +452,7 @@ static struct ftrace_event_call event_##call; \
static void ftrace_raw_event_##call(proto) \ static void ftrace_raw_event_##call(proto) \
{ \ { \
struct ftrace_str_offsets_##call __maybe_unused __str_offsets; \ struct ftrace_str_offsets_##call __maybe_unused __str_offsets; \
struct ftrace_event_call *call = &event_##call; \ struct ftrace_event_call *event_call = &event_##call; \
struct ring_buffer_event *event; \ struct ring_buffer_event *event; \
struct ftrace_raw_##call *entry; \ struct ftrace_raw_##call *entry; \
unsigned long irq_flags; \ unsigned long irq_flags; \
...@@ -473,7 +473,7 @@ static void ftrace_raw_event_##call(proto) \ ...@@ -473,7 +473,7 @@ static void ftrace_raw_event_##call(proto) \
\ \
assign; \ 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); \ trace_nowake_buffer_unlock_commit(event, irq_flags, pc); \
} \ } \
\ \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment