diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ftrace_event.h | 2 | ||||
| -rw-r--r-- | include/linux/syscalls.h | 2 | ||||
| -rw-r--r-- | include/trace/ftrace.h | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index 479c3c1876e6..393a8394df0e 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h @@ -133,6 +133,7 @@ struct ftrace_event_class { int (*define_fields)(struct ftrace_event_call *); struct list_head *(*get_fields)(struct ftrace_event_call *); struct list_head fields; + int (*raw_init)(struct ftrace_event_call *); }; struct ftrace_event_call { @@ -144,7 +145,6 @@ struct ftrace_event_call { int enabled; int id; const char *print_fmt; - int (*raw_init)(struct ftrace_event_call *); int filter_active; struct event_filter *filter; void *mod; diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index fd0f1f248cd8..211c704a71ed 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -135,7 +135,6 @@ extern struct ftrace_event_class event_class_syscall_exit; .name = "sys_enter"#sname, \ .class = &event_class_syscall_enter, \ .event = &enter_syscall_print_##sname, \ - .raw_init = init_syscall_trace, \ .data = (void *)&__syscall_meta_##sname,\ } @@ -153,7 +152,6 @@ extern struct ftrace_event_class event_class_syscall_exit; .name = "sys_exit"#sname, \ .class = &event_class_syscall_exit, \ .event = &exit_syscall_print_##sname, \ - .raw_init = init_syscall_trace, \ .data = (void *)&__syscall_meta_##sname,\ } diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index c7e3bcd5d52f..e7eb33420b06 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -431,8 +431,9 @@ static inline notrace int ftrace_get_offsets_##call( \ * static struct ftrace_event_class __used event_class_<template> = { * .system = "<system>", * .define_fields = ftrace_define_fields_<call>, - * .fields = LIST_HEAD_INIT(event_class_##call.fields), \ - * .probe = ftrace_raw_event_##call, \ + * .fields = LIST_HEAD_INIT(event_class_##call.fields), + * .raw_init = trace_event_raw_init, + * .probe = ftrace_raw_event_##call, * }; * * static struct ftrace_event_call __used @@ -440,7 +441,6 @@ static inline notrace int ftrace_get_offsets_##call( \ * __attribute__((section("_ftrace_events"))) event_<call> = { * .name = "<call>", * .class = event_class_<template>, - * .raw_init = trace_event_raw_init, * .event = &ftrace_event_type_<call>, * .print_fmt = print_fmt_<call>, * }; @@ -566,6 +566,7 @@ static struct ftrace_event_class __used event_class_##call = { \ .system = __stringify(TRACE_SYSTEM), \ .define_fields = ftrace_define_fields_##call, \ .fields = LIST_HEAD_INIT(event_class_##call.fields),\ + .raw_init = trace_event_raw_init, \ .probe = ftrace_raw_event_##call, \ _TRACE_PERF_INIT(call) \ }; @@ -579,7 +580,6 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ .name = #call, \ .class = &event_class_##template, \ .event = &ftrace_event_type_##call, \ - .raw_init = trace_event_raw_init, \ .print_fmt = print_fmt_##template, \ }; @@ -594,7 +594,6 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ .name = #call, \ .class = &event_class_##template, \ .event = &ftrace_event_type_##call, \ - .raw_init = trace_event_raw_init, \ .print_fmt = print_fmt_##call, \ } |