[GIT PULL] tracing: Fix of mismatch section

From: Steven Rostedt
Date: Fri Oct 16 2020 - 16:22:47 EST



Linus,

Tracing: Fix mismatch section of adding early trace events

- Fixes the issue of a mismatch section that was missed due to gcc
inlining the offending function, while clang did not (and reported
the issue).


Please pull the latest trace-v5.10-2 tree, which can be found at:


git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v5.10-2

Tag SHA1: 39abab2b445c7e77fa0932a45e150c90ede54bd8
Head SHA1: ce66f6136460a51acfc32de4481fe8fd69dfd50b


Masami Hiramatsu (1):
tracing: Remove __init from __trace_early_add_new_event()

----
kernel/trace/trace_events.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit ce66f6136460a51acfc32de4481fe8fd69dfd50b
Author: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Date: Fri Oct 16 13:20:02 2020 +0900

tracing: Remove __init from __trace_early_add_new_event()

The commit 720dee53ad8d ("tracing/boot: Initialize per-instance event
list in early boot") removes __init from __trace_early_add_events()
but __trace_early_add_new_event() still has __init and will cause a
section mismatch.

Remove __init from __trace_early_add_new_event() as same as
__trace_early_add_events().

Link: https://lore.kernel.org/lkml/CAHk-=wjU86UhovK4XuwvCqTOfc+nvtpAuaN2PJBz15z=w=u0Xg@xxxxxxxxxxxxxx/

Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 851ab37058dd..e705f06c68c6 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -2498,7 +2498,7 @@ __trace_add_new_event(struct trace_event_call *call, struct trace_array *tr)
* for enabling events at boot. We want to enable events before
* the filesystem is initialized.
*/
-static __init int
+static int
__trace_early_add_new_event(struct trace_event_call *call,
struct trace_array *tr)
{