* [PATCH 1/2] tracing: trivial cleanup
@ 2012-06-07 23:46 Vaibhav Nagarnaik
2012-06-07 23:46 ` [PATCH 2/2] tracing: Cleanup unnecessary function declarations Vaibhav Nagarnaik
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Vaibhav Nagarnaik @ 2012-06-07 23:46 UTC (permalink / raw)
To: Steven Rostedt
Cc: Justin Teravest, David Sharp, linux-kernel, Vaibhav Nagarnaik
From: David Sharp <dhsharp@google.com>
Remove ftrace_format_syscall() declaration; it is neither defined nor
used. Also update a comment and formatting.
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
---
include/trace/syscall.h | 2 --
kernel/trace/ring_buffer.c | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 31966a4..0c95796 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -39,8 +39,6 @@ extern int reg_event_syscall_enter(struct ftrace_event_call *call);
extern void unreg_event_syscall_enter(struct ftrace_event_call *call);
extern int reg_event_syscall_exit(struct ftrace_event_call *call);
extern void unreg_event_syscall_exit(struct ftrace_event_call *call);
-extern int
-ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s);
enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags,
struct trace_event *event);
enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags,
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 1d0f6a8..96c2dd1 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1816,7 +1816,7 @@ rb_add_time_stamp(struct ring_buffer_event *event, u64 delta)
}
/**
- * ring_buffer_update_event - update event type and data
+ * rb_update_event - update event type and data
* @event: the even to update
* @type: the type of event
* @length: the size of the event field in the ring buffer
@@ -2716,8 +2716,8 @@ EXPORT_SYMBOL_GPL(ring_buffer_discard_commit);
* and not the length of the event which would hold the header.
*/
int ring_buffer_write(struct ring_buffer *buffer,
- unsigned long length,
- void *data)
+ unsigned long length,
+ void *data)
{
struct ring_buffer_per_cpu *cpu_buffer;
struct ring_buffer_event *event;
--
1.7.7.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] tracing: Cleanup unnecessary function declarations
2012-06-07 23:46 [PATCH 1/2] tracing: trivial cleanup Vaibhav Nagarnaik
@ 2012-06-07 23:46 ` Vaibhav Nagarnaik
2012-11-14 6:50 ` [tip:perf/core] " tip-bot for Vaibhav Nagarnaik
2012-10-12 1:56 ` [PATCH 1/2] tracing: trivial cleanup Steven Rostedt
2012-11-14 6:49 ` [tip:perf/core] tracing: Trivial cleanup tip-bot for David Sharp
2 siblings, 1 reply; 8+ messages in thread
From: Vaibhav Nagarnaik @ 2012-06-07 23:46 UTC (permalink / raw)
To: Steven Rostedt
Cc: Justin Teravest, David Sharp, linux-kernel, Vaibhav Nagarnaik
The functions defined in include/trace/syscalls.h are not used directly
since struct ftrace_event_class was introduced. Remove them from the
header file and rearrange the ftrace_event_class declarations in
trace_syscalls.c.
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
---
include/trace/syscall.h | 21 --------------
kernel/trace/trace_syscalls.c | 61 +++++++++++++++++++---------------------
2 files changed, 29 insertions(+), 53 deletions(-)
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 0c95796..84bc419 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -31,25 +31,4 @@ struct syscall_metadata {
struct ftrace_event_call *exit_event;
};
-#ifdef CONFIG_FTRACE_SYSCALLS
-extern unsigned long arch_syscall_addr(int nr);
-extern int init_syscall_trace(struct ftrace_event_call *call);
-
-extern int reg_event_syscall_enter(struct ftrace_event_call *call);
-extern void unreg_event_syscall_enter(struct ftrace_event_call *call);
-extern int reg_event_syscall_exit(struct ftrace_event_call *call);
-extern void unreg_event_syscall_exit(struct ftrace_event_call *call);
-enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags,
- struct trace_event *event);
-enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags,
- struct trace_event *event);
-#endif
-
-#ifdef CONFIG_PERF_EVENTS
-int perf_sysenter_enable(struct ftrace_event_call *call);
-void perf_sysenter_disable(struct ftrace_event_call *call);
-int perf_sysexit_enable(struct ftrace_event_call *call);
-void perf_sysexit_disable(struct ftrace_event_call *call);
-#endif
-
#endif /* _TRACE_SYSCALL_H */
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 96fc733..72a5222 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -21,9 +21,6 @@ static int syscall_enter_register(struct ftrace_event_call *event,
static int syscall_exit_register(struct ftrace_event_call *event,
enum trace_reg type, void *data);
-static int syscall_enter_define_fields(struct ftrace_event_call *call);
-static int syscall_exit_define_fields(struct ftrace_event_call *call);
-
static struct list_head *
syscall_get_enter_fields(struct ftrace_event_call *call)
{
@@ -32,30 +29,6 @@ syscall_get_enter_fields(struct ftrace_event_call *call)
return &entry->enter_fields;
}
-struct trace_event_functions enter_syscall_print_funcs = {
- .trace = print_syscall_enter,
-};
-
-struct trace_event_functions exit_syscall_print_funcs = {
- .trace = print_syscall_exit,
-};
-
-struct ftrace_event_class event_class_syscall_enter = {
- .system = "syscalls",
- .reg = syscall_enter_register,
- .define_fields = syscall_enter_define_fields,
- .get_fields = syscall_get_enter_fields,
- .raw_init = init_syscall_trace,
-};
-
-struct ftrace_event_class event_class_syscall_exit = {
- .system = "syscalls",
- .reg = syscall_exit_register,
- .define_fields = syscall_exit_define_fields,
- .fields = LIST_HEAD_INIT(event_class_syscall_exit.fields),
- .raw_init = init_syscall_trace,
-};
-
extern struct syscall_metadata *__start_syscalls_metadata[];
extern struct syscall_metadata *__stop_syscalls_metadata[];
@@ -432,7 +405,7 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call)
mutex_unlock(&syscall_trace_lock);
}
-int init_syscall_trace(struct ftrace_event_call *call)
+static int init_syscall_trace(struct ftrace_event_call *call)
{
int id;
int num;
@@ -457,6 +430,30 @@ int init_syscall_trace(struct ftrace_event_call *call)
return id;
}
+struct trace_event_functions enter_syscall_print_funcs = {
+ .trace = print_syscall_enter,
+};
+
+struct trace_event_functions exit_syscall_print_funcs = {
+ .trace = print_syscall_exit,
+};
+
+struct ftrace_event_class event_class_syscall_enter = {
+ .system = "syscalls",
+ .reg = syscall_enter_register,
+ .define_fields = syscall_enter_define_fields,
+ .get_fields = syscall_get_enter_fields,
+ .raw_init = init_syscall_trace,
+};
+
+struct ftrace_event_class event_class_syscall_exit = {
+ .system = "syscalls",
+ .reg = syscall_exit_register,
+ .define_fields = syscall_exit_define_fields,
+ .fields = LIST_HEAD_INIT(event_class_syscall_exit.fields),
+ .raw_init = init_syscall_trace,
+};
+
unsigned long __init __weak arch_syscall_addr(int nr)
{
return (unsigned long)sys_call_table[nr];
@@ -535,7 +532,7 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head);
}
-int perf_sysenter_enable(struct ftrace_event_call *call)
+static int perf_sysenter_enable(struct ftrace_event_call *call)
{
int ret = 0;
int num;
@@ -556,7 +553,7 @@ int perf_sysenter_enable(struct ftrace_event_call *call)
return ret;
}
-void perf_sysenter_disable(struct ftrace_event_call *call)
+static void perf_sysenter_disable(struct ftrace_event_call *call)
{
int num;
@@ -611,7 +608,7 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head);
}
-int perf_sysexit_enable(struct ftrace_event_call *call)
+static int perf_sysexit_enable(struct ftrace_event_call *call)
{
int ret = 0;
int num;
@@ -632,7 +629,7 @@ int perf_sysexit_enable(struct ftrace_event_call *call)
return ret;
}
-void perf_sysexit_disable(struct ftrace_event_call *call)
+static void perf_sysexit_disable(struct ftrace_event_call *call)
{
int num;
--
1.7.7.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] tracing: trivial cleanup
2012-06-07 23:46 [PATCH 1/2] tracing: trivial cleanup Vaibhav Nagarnaik
2012-06-07 23:46 ` [PATCH 2/2] tracing: Cleanup unnecessary function declarations Vaibhav Nagarnaik
@ 2012-10-12 1:56 ` Steven Rostedt
2012-10-12 2:31 ` David Sharp
2012-11-14 6:49 ` [tip:perf/core] tracing: Trivial cleanup tip-bot for David Sharp
2 siblings, 1 reply; 8+ messages in thread
From: Steven Rostedt @ 2012-10-12 1:56 UTC (permalink / raw)
To: Vaibhav Nagarnaik; +Cc: Justin Teravest, David Sharp, linux-kernel
Sorry, I know this is late, but it was pushed down in my todo list
(never off, but something I probably wouldn't have seen for a few more
months).
On Thu, 2012-06-07 at 16:46 -0700, Vaibhav Nagarnaik wrote:
> From: David Sharp <dhsharp@google.com>
If this is from David it needs his SOB.
-- Steve
>
> Remove ftrace_format_syscall() declaration; it is neither defined nor
> used. Also update a comment and formatting.
>
> Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
> ---
> include/trace/syscall.h | 2 --
> kernel/trace/ring_buffer.c | 6 +++---
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/include/trace/syscall.h b/include/trace/syscall.h
> index 31966a4..0c95796 100644
> --- a/include/trace/syscall.h
> +++ b/include/trace/syscall.h
> @@ -39,8 +39,6 @@ extern int reg_event_syscall_enter(struct ftrace_event_call *call);
> extern void unreg_event_syscall_enter(struct ftrace_event_call *call);
> extern int reg_event_syscall_exit(struct ftrace_event_call *call);
> extern void unreg_event_syscall_exit(struct ftrace_event_call *call);
> -extern int
> -ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s);
> enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags,
> struct trace_event *event);
> enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags,
> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
> index 1d0f6a8..96c2dd1 100644
> --- a/kernel/trace/ring_buffer.c
> +++ b/kernel/trace/ring_buffer.c
> @@ -1816,7 +1816,7 @@ rb_add_time_stamp(struct ring_buffer_event *event, u64 delta)
> }
>
> /**
> - * ring_buffer_update_event - update event type and data
> + * rb_update_event - update event type and data
> * @event: the even to update
> * @type: the type of event
> * @length: the size of the event field in the ring buffer
> @@ -2716,8 +2716,8 @@ EXPORT_SYMBOL_GPL(ring_buffer_discard_commit);
> * and not the length of the event which would hold the header.
> */
> int ring_buffer_write(struct ring_buffer *buffer,
> - unsigned long length,
> - void *data)
> + unsigned long length,
> + void *data)
> {
> struct ring_buffer_per_cpu *cpu_buffer;
> struct ring_buffer_event *event;
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] tracing: trivial cleanup
2012-10-12 1:56 ` [PATCH 1/2] tracing: trivial cleanup Steven Rostedt
@ 2012-10-12 2:31 ` David Sharp
2012-10-12 2:42 ` Steven Rostedt
0 siblings, 1 reply; 8+ messages in thread
From: David Sharp @ 2012-10-12 2:31 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Vaibhav Nagarnaik, linux-kernel
On Thu, Oct 11, 2012 at 6:56 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> Sorry, I know this is late, but it was pushed down in my todo list
> (never off, but something I probably wouldn't have seen for a few more
> months).
>
> On Thu, 2012-06-07 at 16:46 -0700, Vaibhav Nagarnaik wrote:
>> From: David Sharp <dhsharp@google.com>
>
> If this is from David it needs his SOB.
Is that true even though we are working for the same company?
> -- Steve
>
>>
>> Remove ftrace_format_syscall() declaration; it is neither defined nor
>> used. Also update a comment and formatting.
>>
>> Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
Signed-off-by: David Sharp <dhsharp@google.com>
>> ---
>> include/trace/syscall.h | 2 --
>> kernel/trace/ring_buffer.c | 6 +++---
>> 2 files changed, 3 insertions(+), 5 deletions(-)
>>
>> diff --git a/include/trace/syscall.h b/include/trace/syscall.h
>> index 31966a4..0c95796 100644
>> --- a/include/trace/syscall.h
>> +++ b/include/trace/syscall.h
>> @@ -39,8 +39,6 @@ extern int reg_event_syscall_enter(struct ftrace_event_call *call);
>> extern void unreg_event_syscall_enter(struct ftrace_event_call *call);
>> extern int reg_event_syscall_exit(struct ftrace_event_call *call);
>> extern void unreg_event_syscall_exit(struct ftrace_event_call *call);
>> -extern int
>> -ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s);
>> enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags,
>> struct trace_event *event);
>> enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags,
>> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
>> index 1d0f6a8..96c2dd1 100644
>> --- a/kernel/trace/ring_buffer.c
>> +++ b/kernel/trace/ring_buffer.c
>> @@ -1816,7 +1816,7 @@ rb_add_time_stamp(struct ring_buffer_event *event, u64 delta)
>> }
>>
>> /**
>> - * ring_buffer_update_event - update event type and data
>> + * rb_update_event - update event type and data
>> * @event: the even to update
>> * @type: the type of event
>> * @length: the size of the event field in the ring buffer
>> @@ -2716,8 +2716,8 @@ EXPORT_SYMBOL_GPL(ring_buffer_discard_commit);
>> * and not the length of the event which would hold the header.
>> */
>> int ring_buffer_write(struct ring_buffer *buffer,
>> - unsigned long length,
>> - void *data)
>> + unsigned long length,
>> + void *data)
>> {
>> struct ring_buffer_per_cpu *cpu_buffer;
>> struct ring_buffer_event *event;
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] tracing: trivial cleanup
2012-10-12 2:31 ` David Sharp
@ 2012-10-12 2:42 ` Steven Rostedt
2012-10-12 6:07 ` Borislav Petkov
0 siblings, 1 reply; 8+ messages in thread
From: Steven Rostedt @ 2012-10-12 2:42 UTC (permalink / raw)
To: David Sharp; +Cc: Vaibhav Nagarnaik, linux-kernel
On Thu, 2012-10-11 at 19:31 -0700, David Sharp wrote:
> On Thu, Oct 11, 2012 at 6:56 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> > Sorry, I know this is late, but it was pushed down in my todo list
> > (never off, but something I probably wouldn't have seen for a few more
> > months).
> >
> > On Thu, 2012-06-07 at 16:46 -0700, Vaibhav Nagarnaik wrote:
> >> From: David Sharp <dhsharp@google.com>
> >
> > If this is from David it needs his SOB.
>
> Is that true even though we are working for the same company?
>
Yes.
I would never push a patch from Ingo without his Signed-off-by even
though he and I work for the same company ;-)
Although, the GPL would let you. But it's best not to do it.
-- Steve
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] tracing: trivial cleanup
2012-10-12 2:42 ` Steven Rostedt
@ 2012-10-12 6:07 ` Borislav Petkov
0 siblings, 0 replies; 8+ messages in thread
From: Borislav Petkov @ 2012-10-12 6:07 UTC (permalink / raw)
To: Steven Rostedt; +Cc: David Sharp, Vaibhav Nagarnaik, linux-kernel
On Thu, Oct 11, 2012 at 10:42:26PM -0400, Steven Rostedt wrote:
> On Thu, 2012-10-11 at 19:31 -0700, David Sharp wrote:
> > On Thu, Oct 11, 2012 at 6:56 PM, Steven Rostedt <rostedt@goodmis.org> wrote:
> > > Sorry, I know this is late, but it was pushed down in my todo list
> > > (never off, but something I probably wouldn't have seen for a few more
> > > months).
> > >
> > > On Thu, 2012-06-07 at 16:46 -0700, Vaibhav Nagarnaik wrote:
> > >> From: David Sharp <dhsharp@google.com>
> > >
> > > If this is from David it needs his SOB.
> >
> > Is that true even though we are working for the same company?
> >
>
> Yes.
>
> I would never push a patch from Ingo without his Signed-off-by even
> though he and I work for the same company ;-)
>
> Although, the GPL would let you. But it's best not to do it.
I'd say that it is even a no-no. The SOB chain denotes author - possible
intermediary handler as in this case - committer and we all feel very
strongly (I'm told :-)) about stating the exact origin and path upstream
of every patch. So it is not only an authorship issue.
--
Regards/Gruss,
Boris.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [tip:perf/core] tracing: Trivial cleanup
2012-06-07 23:46 [PATCH 1/2] tracing: trivial cleanup Vaibhav Nagarnaik
2012-06-07 23:46 ` [PATCH 2/2] tracing: Cleanup unnecessary function declarations Vaibhav Nagarnaik
2012-10-12 1:56 ` [PATCH 1/2] tracing: trivial cleanup Steven Rostedt
@ 2012-11-14 6:49 ` tip-bot for David Sharp
2 siblings, 0 replies; 8+ messages in thread
From: tip-bot for David Sharp @ 2012-11-14 6:49 UTC (permalink / raw)
To: linux-tip-commits
Cc: vnagarnaik, linux-kernel, hpa, mingo, rostedt, dhsharp, tglx
Commit-ID: 01e3e710a9265fb7092efd67243d7b6dd6e2548a
Gitweb: http://git.kernel.org/tip/01e3e710a9265fb7092efd67243d7b6dd6e2548a
Author: David Sharp <dhsharp@google.com>
AuthorDate: Thu, 7 Jun 2012 16:46:24 -0700
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Wed, 31 Oct 2012 16:45:33 -0400
tracing: Trivial cleanup
Remove ftrace_format_syscall() declaration; it is neither defined nor
used. Also update a comment and formatting.
Link: http://lkml.kernel.org/r/1339112785-21806-1-git-send-email-vnagarnaik@google.com
Signed-off-by: David Sharp <dhsharp@google.com>
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/trace/syscall.h | 2 --
kernel/trace/ring_buffer.c | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 31966a4..0c95796 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -39,8 +39,6 @@ extern int reg_event_syscall_enter(struct ftrace_event_call *call);
extern void unreg_event_syscall_enter(struct ftrace_event_call *call);
extern int reg_event_syscall_exit(struct ftrace_event_call *call);
extern void unreg_event_syscall_exit(struct ftrace_event_call *call);
-extern int
-ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s);
enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags,
struct trace_event *event);
enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags,
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 0ebeb1d..23a384b 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1821,7 +1821,7 @@ rb_add_time_stamp(struct ring_buffer_event *event, u64 delta)
}
/**
- * ring_buffer_update_event - update event type and data
+ * rb_update_event - update event type and data
* @event: the even to update
* @type: the type of event
* @length: the size of the event field in the ring buffer
@@ -2723,8 +2723,8 @@ EXPORT_SYMBOL_GPL(ring_buffer_discard_commit);
* and not the length of the event which would hold the header.
*/
int ring_buffer_write(struct ring_buffer *buffer,
- unsigned long length,
- void *data)
+ unsigned long length,
+ void *data)
{
struct ring_buffer_per_cpu *cpu_buffer;
struct ring_buffer_event *event;
^ permalink raw reply [flat|nested] 8+ messages in thread
* [tip:perf/core] tracing: Cleanup unnecessary function declarations
2012-06-07 23:46 ` [PATCH 2/2] tracing: Cleanup unnecessary function declarations Vaibhav Nagarnaik
@ 2012-11-14 6:50 ` tip-bot for Vaibhav Nagarnaik
0 siblings, 0 replies; 8+ messages in thread
From: tip-bot for Vaibhav Nagarnaik @ 2012-11-14 6:50 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, vnagarnaik, hpa, mingo, rostedt, tglx
Commit-ID: 6f86ab9fcaef122abb837819139eadac1a0ca966
Gitweb: http://git.kernel.org/tip/6f86ab9fcaef122abb837819139eadac1a0ca966
Author: Vaibhav Nagarnaik <vnagarnaik@google.com>
AuthorDate: Thu, 7 Jun 2012 16:46:25 -0700
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Wed, 31 Oct 2012 16:45:34 -0400
tracing: Cleanup unnecessary function declarations
The functions defined in include/trace/syscalls.h are not used directly
since struct ftrace_event_class was introduced. Remove them from the
header file and rearrange the ftrace_event_class declarations in
trace_syscalls.c.
Link: http://lkml.kernel.org/r/1339112785-21806-2-git-send-email-vnagarnaik@google.com
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/trace/syscall.h | 21 --------------
kernel/trace/trace_syscalls.c | 61 +++++++++++++++++++---------------------
2 files changed, 29 insertions(+), 53 deletions(-)
diff --git a/include/trace/syscall.h b/include/trace/syscall.h
index 0c95796..84bc419 100644
--- a/include/trace/syscall.h
+++ b/include/trace/syscall.h
@@ -31,25 +31,4 @@ struct syscall_metadata {
struct ftrace_event_call *exit_event;
};
-#ifdef CONFIG_FTRACE_SYSCALLS
-extern unsigned long arch_syscall_addr(int nr);
-extern int init_syscall_trace(struct ftrace_event_call *call);
-
-extern int reg_event_syscall_enter(struct ftrace_event_call *call);
-extern void unreg_event_syscall_enter(struct ftrace_event_call *call);
-extern int reg_event_syscall_exit(struct ftrace_event_call *call);
-extern void unreg_event_syscall_exit(struct ftrace_event_call *call);
-enum print_line_t print_syscall_enter(struct trace_iterator *iter, int flags,
- struct trace_event *event);
-enum print_line_t print_syscall_exit(struct trace_iterator *iter, int flags,
- struct trace_event *event);
-#endif
-
-#ifdef CONFIG_PERF_EVENTS
-int perf_sysenter_enable(struct ftrace_event_call *call);
-void perf_sysenter_disable(struct ftrace_event_call *call);
-int perf_sysexit_enable(struct ftrace_event_call *call);
-void perf_sysexit_disable(struct ftrace_event_call *call);
-#endif
-
#endif /* _TRACE_SYSCALL_H */
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 2485a7d..7609dd6 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -21,9 +21,6 @@ static int syscall_enter_register(struct ftrace_event_call *event,
static int syscall_exit_register(struct ftrace_event_call *event,
enum trace_reg type, void *data);
-static int syscall_enter_define_fields(struct ftrace_event_call *call);
-static int syscall_exit_define_fields(struct ftrace_event_call *call);
-
static struct list_head *
syscall_get_enter_fields(struct ftrace_event_call *call)
{
@@ -32,30 +29,6 @@ syscall_get_enter_fields(struct ftrace_event_call *call)
return &entry->enter_fields;
}
-struct trace_event_functions enter_syscall_print_funcs = {
- .trace = print_syscall_enter,
-};
-
-struct trace_event_functions exit_syscall_print_funcs = {
- .trace = print_syscall_exit,
-};
-
-struct ftrace_event_class event_class_syscall_enter = {
- .system = "syscalls",
- .reg = syscall_enter_register,
- .define_fields = syscall_enter_define_fields,
- .get_fields = syscall_get_enter_fields,
- .raw_init = init_syscall_trace,
-};
-
-struct ftrace_event_class event_class_syscall_exit = {
- .system = "syscalls",
- .reg = syscall_exit_register,
- .define_fields = syscall_exit_define_fields,
- .fields = LIST_HEAD_INIT(event_class_syscall_exit.fields),
- .raw_init = init_syscall_trace,
-};
-
extern struct syscall_metadata *__start_syscalls_metadata[];
extern struct syscall_metadata *__stop_syscalls_metadata[];
@@ -432,7 +405,7 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call)
mutex_unlock(&syscall_trace_lock);
}
-int init_syscall_trace(struct ftrace_event_call *call)
+static int init_syscall_trace(struct ftrace_event_call *call)
{
int id;
int num;
@@ -457,6 +430,30 @@ int init_syscall_trace(struct ftrace_event_call *call)
return id;
}
+struct trace_event_functions enter_syscall_print_funcs = {
+ .trace = print_syscall_enter,
+};
+
+struct trace_event_functions exit_syscall_print_funcs = {
+ .trace = print_syscall_exit,
+};
+
+struct ftrace_event_class event_class_syscall_enter = {
+ .system = "syscalls",
+ .reg = syscall_enter_register,
+ .define_fields = syscall_enter_define_fields,
+ .get_fields = syscall_get_enter_fields,
+ .raw_init = init_syscall_trace,
+};
+
+struct ftrace_event_class event_class_syscall_exit = {
+ .system = "syscalls",
+ .reg = syscall_exit_register,
+ .define_fields = syscall_exit_define_fields,
+ .fields = LIST_HEAD_INIT(event_class_syscall_exit.fields),
+ .raw_init = init_syscall_trace,
+};
+
unsigned long __init __weak arch_syscall_addr(int nr)
{
return (unsigned long)sys_call_table[nr];
@@ -537,7 +534,7 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head, NULL);
}
-int perf_sysenter_enable(struct ftrace_event_call *call)
+static int perf_sysenter_enable(struct ftrace_event_call *call)
{
int ret = 0;
int num;
@@ -558,7 +555,7 @@ int perf_sysenter_enable(struct ftrace_event_call *call)
return ret;
}
-void perf_sysenter_disable(struct ftrace_event_call *call)
+static void perf_sysenter_disable(struct ftrace_event_call *call)
{
int num;
@@ -615,7 +612,7 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
perf_trace_buf_submit(rec, size, rctx, 0, 1, regs, head, NULL);
}
-int perf_sysexit_enable(struct ftrace_event_call *call)
+static int perf_sysexit_enable(struct ftrace_event_call *call)
{
int ret = 0;
int num;
@@ -636,7 +633,7 @@ int perf_sysexit_enable(struct ftrace_event_call *call)
return ret;
}
-void perf_sysexit_disable(struct ftrace_event_call *call)
+static void perf_sysexit_disable(struct ftrace_event_call *call)
{
int num;
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-11-14 6:50 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-07 23:46 [PATCH 1/2] tracing: trivial cleanup Vaibhav Nagarnaik
2012-06-07 23:46 ` [PATCH 2/2] tracing: Cleanup unnecessary function declarations Vaibhav Nagarnaik
2012-11-14 6:50 ` [tip:perf/core] " tip-bot for Vaibhav Nagarnaik
2012-10-12 1:56 ` [PATCH 1/2] tracing: trivial cleanup Steven Rostedt
2012-10-12 2:31 ` David Sharp
2012-10-12 2:42 ` Steven Rostedt
2012-10-12 6:07 ` Borislav Petkov
2012-11-14 6:49 ` [tip:perf/core] tracing: Trivial cleanup tip-bot for David Sharp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome