From: "tip-bot2 for Ingo Molnar" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Josh Poimboeuf <jpoimboe@kernel.org>,
linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
x86@kernel.org
Subject: [tip: objtool/core] x86/orc: Make the is_callthunk() definition depend on CONFIG_BPF_JIT=y
Date: Fri, 09 Jun 2023 09:10:24 -0000 [thread overview]
Message-ID: <168630182497.404.6489095228075454990.tip-bot2@tip-bot2> (raw)
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: f2d89c50301987db9e9252919fb6ce2ecdb667c7
Gitweb: https://git.kernel.org/tip/f2d89c50301987db9e9252919fb6ce2ecdb667c7
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Fri, 09 Jun 2023 11:04:53 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 09 Jun 2023 11:04:53 +02:00
x86/orc: Make the is_callthunk() definition depend on CONFIG_BPF_JIT=y
Recent commit:
020126239b8f Revert "x86/orc: Make it callthunk aware"
Made the only user of is_callthunk() depend on CONFIG_BPF_JIT=y, while
the definition of the helper function is unconditional.
Addresses this build failure:
arch/x86/kernel/callthunks.c:296:13: error: ‘is_callthunk’ defined but not used [-Werror=unused-function]
Move is_callthunk() inside the #ifdef block.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
---
arch/x86/kernel/callthunks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/callthunks.c b/arch/x86/kernel/callthunks.c
index 8e0a9b6..fcb8eea 100644
--- a/arch/x86/kernel/callthunks.c
+++ b/arch/x86/kernel/callthunks.c
@@ -293,6 +293,7 @@ void *callthunks_translate_call_dest(void *dest)
return target ? : dest;
}
+#ifdef CONFIG_BPF_JIT
static bool is_callthunk(void *addr)
{
unsigned int tmpl_size = SKL_TMPL_SIZE;
@@ -306,7 +307,6 @@ static bool is_callthunk(void *addr)
return !bcmp((void *)(dest - tmpl_size), tmpl, tmpl_size);
}
-#ifdef CONFIG_BPF_JIT
int x86_call_depth_emit_accounting(u8 **pprog, void *func)
{
unsigned int tmpl_size = SKL_TMPL_SIZE;
next reply other threads:[~2023-06-09 9:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-09 9:10 tip-bot2 for Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-09 9:18 [tip: objtool/core] x86/orc: Make the is_callthunk() definition depend on CONFIG_BPF_JIT=y tip-bot2 for Ingo Molnar
2023-06-09 21:24 ` Josh Poimboeuf
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=168630182497.404.6489095228075454990.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=x86@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).