diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 3a5c874a40ae20c909d87f42b08d5bf62ec4e6a9..ba44c65af820a40752a4f6ce81e298e00defbd28 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9963,6 +9963,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 e867124df48540c67d6388af6f1e227ae4943501..4c3372ffae912551684477822a8c543c1aa80fad 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1527,6 +1527,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 42618f0efda803f0ff9afb5bc33fd7f67f862149..0a468fb78e3809f7a172857a02365dd4fb1dd306 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -1505,7 +1505,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; @@ -1523,4 +1523,3 @@ __init static int init_events(void) return 0; } -early_initcall(init_events);