From: Masami Hiramatsu <mhiramat@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
LKML <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Tom Zanussi <zanussi@kernel.org>
Subject: Re: [GIT PULL] tracing: Updates for 5.10
Date: Fri, 16 Oct 2020 11:34:45 +0900 [thread overview]
Message-ID: <20201016113445.4bd2a37c9b5e7f3a065b6f52@kernel.org> (raw)
In-Reply-To: <CAHk-=wjU86UhovK4XuwvCqTOfc+nvtpAuaN2PJBz15z=w=u0Xg@mail.gmail.com>
On Thu, 15 Oct 2020 18:54:34 -0700
Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Thu, Oct 15, 2020 at 10:53 AM Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > Updates for tracing and bootconfig:
>
> Hmm. I haven't verified that this came from you, but it seems likely..
> Once again my clang build shows something that I don't see in my
> allmodconfig gcc build:
>
> WARNING: modpost: vmlinux.o(.text+0x1e5b06): Section mismatch in
> reference from the function __trace_early_add_events() to the function
> .init.text:__trace_early_add_new_event()
> The function __trace_early_add_events() references
> the function __init __trace_early_add_new_event().
> This is often because __trace_early_add_events lacks a __init
> annotation or the annotation of __trace_early_add_new_event is wrong.
>
> Hmm?
Oops, that's my fault.
The commit 720dee53ad8d ("tracing/boot: Initialize per-instance event list
in early boot") removes __init from __trace_early_add_events() but I
forgot to do same on __trace_early_add_new_event().
Would this work?
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)
{
--
Masami Hiramatsu <mhiramat@kernel.org>
prev parent reply other threads:[~2020-10-16 2:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 17:53 Steven Rostedt
2020-10-15 23:08 ` pr-tracker-bot
2020-10-16 1:54 ` Linus Torvalds
2020-10-16 2:21 ` Steven Rostedt
2020-10-16 2:53 ` Masami Hiramatsu
2020-10-16 3:54 ` Steven Rostedt
2020-10-16 4:05 ` Masami Hiramatsu
2020-10-16 4:20 ` [PATCH] tracing: Remove __init from __trace_early_add_new_event() Masami Hiramatsu
2020-10-16 2:34 ` Masami Hiramatsu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201016113445.4bd2a37c9b5e7f3a065b6f52@kernel.org \
--to=mhiramat@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=torvalds@linux-foundation.org \
--cc=zanussi@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®