diff options
| -rw-r--r-- | include/linux/syscalls.h | 4 | ||||
| -rw-r--r-- | include/trace/syscall.h | 2 | ||||
| -rw-r--r-- | kernel/trace/trace_syscalls.c | 8 |
3 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index b50974a93af0..2f7c539ab96d 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h | |||
| @@ -178,7 +178,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ | |||
| 178 | event_enter_##sname = { \ | 178 | event_enter_##sname = { \ |
| 179 | .name = "sys_enter"#sname, \ | 179 | .name = "sys_enter"#sname, \ |
| 180 | .system = "syscalls", \ | 180 | .system = "syscalls", \ |
| 181 | .event = &event_syscall_enter, \ | 181 | .event = &enter_syscall_print_##sname, \ |
| 182 | .raw_init = init_enter_##sname, \ | 182 | .raw_init = init_enter_##sname, \ |
| 183 | .show_format = syscall_enter_format, \ | 183 | .show_format = syscall_enter_format, \ |
| 184 | .define_fields = syscall_enter_define_fields, \ | 184 | .define_fields = syscall_enter_define_fields, \ |
| @@ -214,7 +214,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \ | |||
| 214 | event_exit_##sname = { \ | 214 | event_exit_##sname = { \ |
| 215 | .name = "sys_exit"#sname, \ | 215 | .name = "sys_exit"#sname, \ |
| 216 | .system = "syscalls", \ | 216 | .system = "syscalls", \ |
| 217 | .event = &event_syscall_exit, \ | 217 | .event = &exit_syscall_print_##sname, \ |
| 218 | .raw_init = init_exit_##sname, \ | 218 | .raw_init = init_exit_##sname, \ |
| 219 | .show_format = syscall_exit_format, \ | 219 | .show_format = syscall_exit_format, \ |
| 220 | .define_fields = syscall_exit_define_fields, \ | 220 | .define_fields = syscall_exit_define_fields, \ |
diff --git a/include/trace/syscall.h b/include/trace/syscall.h index 51ee17d3632a..5f8827c92db7 100644 --- a/include/trace/syscall.h +++ b/include/trace/syscall.h | |||
| @@ -37,8 +37,6 @@ extern unsigned long arch_syscall_addr(int nr); | |||
| 37 | extern int syscall_name_to_nr(char *name); | 37 | extern int syscall_name_to_nr(char *name); |
| 38 | void set_syscall_enter_id(int num, int id); | 38 | void set_syscall_enter_id(int num, int id); |
| 39 | void set_syscall_exit_id(int num, int id); | 39 | void set_syscall_exit_id(int num, int id); |
| 40 | extern struct trace_event event_syscall_enter; | ||
| 41 | extern struct trace_event event_syscall_exit; | ||
| 42 | 40 | ||
| 43 | extern int syscall_enter_format(struct ftrace_event_call *call, | 41 | extern int syscall_enter_format(struct ftrace_event_call *call, |
| 44 | struct trace_seq *s); | 42 | struct trace_seq *s); |
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 63aa8070365d..00d6e176f5b6 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c | |||
| @@ -444,14 +444,6 @@ void unreg_event_syscall_exit(struct ftrace_event_call *call) | |||
| 444 | mutex_unlock(&syscall_trace_lock); | 444 | mutex_unlock(&syscall_trace_lock); |
| 445 | } | 445 | } |
| 446 | 446 | ||
| 447 | struct trace_event event_syscall_enter = { | ||
| 448 | .trace = print_syscall_enter, | ||
| 449 | }; | ||
| 450 | |||
| 451 | struct trace_event event_syscall_exit = { | ||
| 452 | .trace = print_syscall_exit, | ||
| 453 | }; | ||
| 454 | |||
| 455 | int __init init_ftrace_syscalls(void) | 447 | int __init init_ftrace_syscalls(void) |
| 456 | { | 448 | { |
| 457 | struct syscall_metadata *meta; | 449 | struct syscall_metadata *meta; |
