diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 9adbad93662da01f1433f34d9f7b8e62ec7798c6..a5c3fb0058d5a4a2c479f2d7bd206b83db631e59 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -9779,6 +9779,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 c0596e250c2ab7d1743cacabc74b3bcb1fb1afd8..045cd3b142e6e79d6651c1fc30cb0f88b042dd34 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1675,6 +1675,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 7042544c5bde1d55b0afa0f7643b43bd125b395a..4778cecee4f628041afeb17d640b3ce4d404bd6a 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -1495,7 +1495,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;
@@ -1513,4 +1513,3 @@ __init static int init_events(void)
 
 	return 0;
 }
-early_initcall(init_events);