iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

Browse Source
This commit is contained in:
Ingo Molnar 2011-01-15 15:23:27 +01:00
commit 7c46d8da09
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/trace/events/module.h
View File

@ -1,5 +1,15 @@
/*
* Because linux/module.h has tracepoints in the header, and ftrace.h
* eventually includes this file, define_trace.h includes linux/module.h
* But we do not want the module.h to override the TRACE_SYSTEM macro
* variable that define_trace.h is processing, so we only set it
* when module events are being processed, which would happen when
* CREATE_TRACE_POINTS is defined.
*/
#ifdef CREATE_TRACE_POINTS
#undef TRACE_SYSTEM #undef TRACE_SYSTEM
#define TRACE_SYSTEM module #define TRACE_SYSTEM module
#endif
#if !defined(_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ) #if !defined(_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_MODULE_H #define _TRACE_MODULE_H

33
kernel/trace/trace_syscalls.c
View File

@ -23,9 +23,6 @@ static int syscall_exit_register(struct ftrace_event_call *event,
static int syscall_enter_define_fields(struct ftrace_event_call *call); static int syscall_enter_define_fields(struct ftrace_event_call *call);
static int syscall_exit_define_fields(struct ftrace_event_call *call); static int syscall_exit_define_fields(struct ftrace_event_call *call);
/* All syscall exit events have the same fields */
static LIST_HEAD(syscall_exit_fields);
static struct list_head * static struct list_head *
syscall_get_enter_fields(struct ftrace_event_call *call) syscall_get_enter_fields(struct ftrace_event_call *call)
{ {
@ -34,34 +31,28 @@ syscall_get_enter_fields(struct ftrace_event_call *call)
return &entry->enter_fields; return &entry->enter_fields;
} }
static struct list_head *
syscall_get_exit_fields(struct ftrace_event_call *call)
{
return &syscall_exit_fields;
}
struct trace_event_functions enter_syscall_print_funcs = { struct trace_event_functions enter_syscall_print_funcs = {
.trace = print_syscall_enter, .trace = print_syscall_enter,
}; };
struct trace_event_functions exit_syscall_print_funcs = { struct trace_event_functions exit_syscall_print_funcs = {
.trace = print_syscall_exit, .trace = print_syscall_exit,
}; };
struct ftrace_event_class event_class_syscall_enter = { struct ftrace_event_class event_class_syscall_enter = {
.system = "syscalls", .system = "syscalls",
.reg = syscall_enter_register, .reg = syscall_enter_register,
.define_fields = syscall_enter_define_fields, .define_fields = syscall_enter_define_fields,
.get_fields = syscall_get_enter_fields, .get_fields = syscall_get_enter_fields,
.raw_init = init_syscall_trace, .raw_init = init_syscall_trace,
}; };
struct ftrace_event_class event_class_syscall_exit = { struct ftrace_event_class event_class_syscall_exit = {
.system = "syscalls", .system = "syscalls",
.reg = syscall_exit_register, .reg = syscall_exit_register,
.define_fields = syscall_exit_define_fields, .define_fields = syscall_exit_define_fields,
.get_fields = syscall_get_exit_fields, .fields = LIST_HEAD_INIT(event_class_syscall_exit.fields),
.raw_init = init_syscall_trace, .raw_init = init_syscall_trace,
}; };
extern unsigned long __start_syscalls_metadata[]; extern unsigned long __start_syscalls_metadata[];