From nobody Sun Feb 8 05:37:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 172BFC7EE29 for ; Fri, 9 Jun 2023 09:16:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241367AbjFIJQq (ORCPT ); Fri, 9 Jun 2023 05:16:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239338AbjFIJP6 (ORCPT ); Fri, 9 Jun 2023 05:15:58 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3169421A; Fri, 9 Jun 2023 02:11:54 -0700 (PDT) Date: Fri, 09 Jun 2023 09:10:24 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686301826; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4GO9ye3jFV7uDmDscZs0Go8LN5BRnU6BdMpCcsv9+M=; b=Mq/HyQcMH2TcUX3C63uYul9aoarM8b1s/sbImeHGjeFetDtvcxcbv/OaYRFZI8Q/TAeLr4 g+TX4gDsKYcQJl5bzydVkCNyGdK0cVlDy/KcA6klH1iBXZy5+6kB1Nu58ZJUmpYRXvUqws y9EiJf5cFTa5beW76K1t8epNAMdHHIk7E2xecz9nA/xvMks7Yenb/UHDn11QjsLv5vUQmO 7SJ0nBVMH/I150v+usDpT+A93p/X+16myq+qAe2DhL6zdXt7gGsZ43AJ0Z3eXI0/GGEfCJ 0kOWEoGLZMNhHg2rcuJOamZHYTafpbbVDoq/MTRplYvQ9zhIvvkOoyFvpEUkVg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686301826; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4GO9ye3jFV7uDmDscZs0Go8LN5BRnU6BdMpCcsv9+M=; b=nxJOAGxKznuQKAH4xHsTM6ZbfXHxzR4zDbwaDKs4tTm2F6tT5qIU/UopTYiUHshlJAdGcs r4ldWGluTCmvqwBQ== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] x86/orc: Make the is_callthunk() definition depend on CONFIG_BPF_JIT=y Cc: Ingo Molnar , Josh Poimboeuf , linux-kernel@vger.kernel.org, Peter Zijlstra , x86@kernel.org MIME-Version: 1.0 Message-ID: <168630182497.404.6489095228075454990.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the objtool/core branch of tip: Commit-ID: f2d89c50301987db9e9252919fb6ce2ecdb667c7 Gitweb: https://git.kernel.org/tip/f2d89c50301987db9e9252919fb6ce2ec= db667c7 Author: Ingo Molnar AuthorDate: Fri, 09 Jun 2023 11:04:53 +02:00 Committer: Ingo Molnar CommitterDate: Fri, 09 Jun 2023 11:04:53 +02:00 x86/orc: Make the is_callthunk() definition depend on CONFIG_BPF_JIT=3Dy Recent commit: 020126239b8f Revert "x86/orc: Make it callthunk aware" Made the only user of is_callthunk() depend on CONFIG_BPF_JIT=3Dy, while the definition of the helper function is unconditional. Addresses this build failure: arch/x86/kernel/callthunks.c:296:13: error: =E2=80=98is_callthunk=E2=80= =99 defined but not used [-Werror=3Dunused-function] Move is_callthunk() inside the #ifdef block. Signed-off-by: Ingo Molnar Cc: Josh Poimboeuf Cc: linux-kernel@vger.kernel.org Cc: Peter Zijlstra --- 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; } =20 +#ifdef CONFIG_BPF_JIT static bool is_callthunk(void *addr) { unsigned int tmpl_size =3D SKL_TMPL_SIZE; @@ -306,7 +307,6 @@ static bool is_callthunk(void *addr) return !bcmp((void *)(dest - tmpl_size), tmpl, tmpl_size); } =20 -#ifdef CONFIG_BPF_JIT int x86_call_depth_emit_accounting(u8 **pprog, void *func) { unsigned int tmpl_size =3D SKL_TMPL_SIZE;