diff options
| author | Ingo Molnar | 2023-06-09 11:04:53 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2023-06-09 11:09:04 +0200 |
| commit | 301cf77e21317b3465c5e2bb0188df24bbf1c2e2 (patch) | |
| tree | be1ad451ac1c4143e2632bb56d4df38cd298d881 | |
| parent | b4c96ef0add5b701eb37be9830a98610e1d9b4a3 (diff) | |
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.
Move is_callthunk() inside the #ifdef block.
Addresses this build failure:
arch/x86/kernel/callthunks.c:296:13: error: ‘is_callthunk’ defined but not used [-Werror=unused-function]
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>
| -rw-r--r-- | arch/x86/kernel/callthunks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/callthunks.c b/arch/x86/kernel/callthunks.c index 8e0a9b637e23..fcb8eeaf65b1 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; |