diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 3076af8dbf32e..546e84ae9993b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -10291,6 +10291,8 @@ void __init early_trace_init(void) static_key_enable(&tracepoint_printk_key.key); } tracer_alloc_buffers(); + + init_events(); } void __init trace_init(void) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 5581754d97628..9e931f51328a2 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1490,6 +1490,7 @@ extern void trace_event_enable_cmd_record(bool enable); extern void trace_event_enable_tgid_record(bool enable); extern int event_trace_init(void); +extern int init_events(void); extern int event_trace_add_tracer(struct dentry *parent, struct trace_array *tr); extern int event_trace_del_tracer(struct trace_array *tr); extern void __trace_early_add_events(struct trace_array *tr); diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 67f47ea27921d..5cd4fb6563068 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -1568,7 +1568,7 @@ static struct trace_event *events[] __initdata = { NULL }; -__init static int init_events(void) +__init int init_events(void) { struct trace_event *event; int i, ret; @@ -1581,4 +1581,3 @@ __init static int init_events(void) return 0; } -early_initcall(init_events);