From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Song Liu <song@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Steven Rostedt <rostedt@goodmis.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: Linux 6.0-rc1
Date: Mon, 15 Aug 2022 04:23:00 +0300 [thread overview]
Message-ID: <20220815012300.hiz5pd3nynrehkhm@box.shutemov.name> (raw)
In-Reply-To: <CAHk-=wgRFjPHV-Y_eKP9wQMLFDgG+dEUHiv5wC17OQHsG5z7BA@mail.gmail.com>
53cd885bc5c3 ("ftrace: Allow IPMODIFY and DIRECT ops on the same
function") breaks build for me (CONFIG_MODULE=n):
CC kernel/trace/ftrace.o
kernel/trace/ftrace.c:3149:1: error: ‘ops_references_rec’ defined but not used [-Werror=unused-function]
3149 | ops_references_rec(struct ftrace_ops *ops, struct dyn_ftrace *rec)
| ^~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
The fix I used locally:
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index bc921a3f7ea8..90fa3ceeaeeb 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3138,19 +3138,6 @@ ops_references_ip(struct ftrace_ops *ops, unsigned long ip)
return true;
}
-/*
- * Check if the current ops references the record.
- *
- * If the ops traces all functions, then it was already accounted for.
- * If the ops does not trace the current record function, skip it.
- * If the ops ignores the function via notrace filter, skip it.
- */
-static bool
-ops_references_rec(struct ftrace_ops *ops, struct dyn_ftrace *rec)
-{
- return ops_references_ip(ops, rec->ip);
-}
-
static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
{
bool init_nop = ftrace_need_init_nop();
@@ -6818,6 +6805,19 @@ static int ftrace_get_trampoline_kallsym(unsigned int symnum,
static LIST_HEAD(ftrace_mod_maps);
+/*
+ * Check if the current ops references the record.
+ *
+ * If the ops traces all functions, then it was already accounted for.
+ * If the ops does not trace the current record function, skip it.
+ * If the ops ignores the function via notrace filter, skip it.
+ */
+static bool
+ops_references_rec(struct ftrace_ops *ops, struct dyn_ftrace *rec)
+{
+ return ops_references_ip(ops, rec->ip);
+}
+
static int referenced_filters(struct dyn_ftrace *rec)
{
struct ftrace_ops *ops;
--
Kiryl Shutsemau / Kirill A. Shutemov
next prev parent reply other threads:[~2022-08-15 1:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-14 23:41 Linux 6.0-rc1 Linus Torvalds
2022-08-15 1:23 ` Kirill A. Shutemov [this message]
2022-08-15 2:27 ` Steven Rostedt
2022-08-15 2:50 ` linux-next: stats (Was: Linux 6.0-rc1) Stephen Rothwell
2022-08-17 14:41 ` Geert Uytterhoeven
2022-08-15 18:04 ` Build regressions/improvements in v6.0-rc1 Geert Uytterhoeven
2022-08-15 18:10 ` Geert Uytterhoeven
2022-08-15 23:48 ` Linux 6.0-rc1 Guenter Roeck
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=20220815012300.hiz5pd3nynrehkhm@box.shutemov.name \
--to=kirill@shutemov.name \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=song@kernel.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).