From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Frederic Weisbecker <fweisbec@gmail.com>,
Li Zefan <lizf@cn.fujitsu.com>
Subject: [PATCH 6/9] tracing: Remove redundant raw_init callbacks
Date: Mon, 28 Jun 2010 23:08:42 -0400 [thread overview]
Message-ID: <20100629031044.142201095@goodmis.org> (raw)
In-Reply-To: 20100629030836.222433712@goodmis.org
[-- Attachment #1: 0006-tracing-Remove-redundant-raw_init-callbacks.patch --]
[-- Type: text/plain, Size: 2320 bytes --]
From: Li Zefan <lizf@cn.fujitsu.com>
raw_init callback is optional.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4BFA37D4.7070500@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace_export.c | 8 +-------
kernel/trace/trace_kprobe.c | 10 +---------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
index 8536e2a..4ba44de 100644
--- a/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@ -125,12 +125,6 @@ ftrace_define_fields_##name(struct ftrace_event_call *event_call) \
#include "trace_entries.h"
-static int ftrace_raw_init_event(struct ftrace_event_call *call)
-{
- INIT_LIST_HEAD(&call->class->fields);
- return 0;
-}
-
#undef __entry
#define __entry REC
@@ -158,7 +152,7 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call)
struct ftrace_event_class event_class_ftrace_##call = { \
.system = __stringify(TRACE_SYSTEM), \
.define_fields = ftrace_define_fields_##call, \
- .raw_init = ftrace_raw_init_event, \
+ .fields = LIST_HEAD_INIT(event_class_ftrace_##call.fields),\
}; \
\
struct ftrace_event_call __used \
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index f52b5f5..3b831d8 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1214,11 +1214,6 @@ static void probe_event_disable(struct ftrace_event_call *call)
}
}
-static int probe_event_raw_init(struct ftrace_event_call *event_call)
-{
- return 0;
-}
-
#undef DEFINE_FIELD
#define DEFINE_FIELD(type, item, name, is_signed) \
do { \
@@ -1486,15 +1481,12 @@ static int register_probe_event(struct trace_probe *tp)
int ret;
/* Initialize ftrace_event_call */
+ INIT_LIST_HEAD(&call->class->fields);
if (probe_is_return(tp)) {
- INIT_LIST_HEAD(&call->class->fields);
call->event.funcs = &kretprobe_funcs;
- call->class->raw_init = probe_event_raw_init;
call->class->define_fields = kretprobe_event_define_fields;
} else {
- INIT_LIST_HEAD(&call->class->fields);
call->event.funcs = &kprobe_funcs;
- call->class->raw_init = probe_event_raw_init;
call->class->define_fields = kprobe_event_define_fields;
}
if (set_print_fmt(tp) < 0)
--
1.7.1
next prev parent reply other threads:[~2010-06-29 3:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-29 3:08 [PATCH 0/9] [GI PULL][2.6.36] tracing: various updates Steven Rostedt
2010-06-29 3:08 ` [PATCH 1/9] tracing: Use a global field list for all syscall exit events Steven Rostedt
2010-06-29 3:08 ` [PATCH 2/9] tracing: Dont allocate common fields for every trace events Steven Rostedt
2010-06-29 3:08 ` [PATCH 3/9] tracing: Convert some timer events to DEFINE_EVENT Steven Rostedt
2010-06-29 3:08 ` [PATCH 4/9] tracing: Convert more sched " Steven Rostedt
2010-06-29 3:08 ` [PATCH 5/9] tracing: Remove test of NULL define_fields callback Steven Rostedt
2010-06-29 3:08 ` Steven Rostedt [this message]
2010-06-29 3:08 ` [PATCH 7/9] tracing: Remove open-coded __trace_add_event_call() Steven Rostedt
2010-06-29 3:08 ` [PATCH 8/9] tracing/function-graph: Use correct string size for snprintf Steven Rostedt
2010-06-29 3:08 ` [PATCH 9/9] tracing: Use class->reg() for all registering of events Steven Rostedt
2010-06-29 8:42 ` [PATCH 0/9] [GI PULL][2.6.36] tracing: various updates Ingo Molnar
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=20100629031044.142201095@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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