From: Zhaolei <zhaolei@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>,
Frederic Weisbecker <fweisbec@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] ftrace: Don't convert function's local variable name in macro
Date: Wed, 27 May 2009 21:36:02 +0800 [thread overview]
Message-ID: <4A1D41C2.2010903@cn.fujitsu.com> (raw)
"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>
---
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
next reply other threads:[~2009-05-27 13:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-27 13:36 Zhaolei [this message]
2009-05-27 13:47 ` [PATCH] ftrace: Don't convert function's local variable name in macro Frederic Weisbecker
2009-05-27 18:12 ` Steven Rostedt
2009-05-27 23:05 ` Frederic Weisbecker
2009-05-27 23:14 ` Ingo Molnar
2009-05-27 23:16 ` Frederic Weisbecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A1D41C2.2010903@cn.fujitsu.com \
--to=zhaolei@cn.fujitsu.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox