From patchwork Fri Jun 23 15:21:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13290791 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D67AEB64DD for ; Fri, 23 Jun 2023 15:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=XEQdk08+mzrIqlxuojFmANbBPlvVFOhJMPEtZX4KYOc=; b=HVEbaV5VYVTSJ6 gfETGd3zKyVpES2Kj9kji8r39XB/Di4BEcGnokxmgG6jhKPBBQFeIG+1hFaZAS1D9ikNqMajyCZhB o2Rcf/tK50b/7AUMTIyvIiQV4lCM5psOs6exSWH8ltm5xNuVTaAKQQou1hQN+ONnaRXr/RWM4thsd rdjw8OKIoOc0S49hZE3r9Z4ow+Mym++VyYGkMqTkAnt50TZyBr42fZEah92F3/TpP1DnMnSeZeRg+ Sbq+XCt6zWfqae53RH39M1YP2qXTW0cL3qHFEzDTXYf7pwQEyCDhS0cqMM0li1cpkGCOsESCr6KVn dO0azt2FMLYeGwYQnwFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qCic1-003vMw-21; Fri, 23 Jun 2023 15:22:13 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qCibz-003vMS-1O for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2023 15:22:12 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D4B8B61A94; Fri, 23 Jun 2023 15:22:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B2ECC433CC; Fri, 23 Jun 2023 15:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687533730; bh=PDmC4YA2NsJQMxRbgNA3iKcTYPuiiTgA/RrritCht8o=; h=From:To:Cc:Subject:Date:From; b=OyfYhhQ7N237/hBj0FLMeGBea8pEcu3RQWI27ZCWysCZGfIv0vRYz6ctD95U5UHWa QRxn2Z1AMJfKwZAW7ntxRBM4P2yKXZh4vZHZ1elQrxHXBM7GVltXBk9yAZqHyWxxax cty0ioHXO81m12xAyhfWBtxL4gyI1cdsAy7TbG9WnovHKP36Ilz47rKGv4hhdIro2o jJvP+Eslv17xAIwqgJmVe7clfkqizwYlFRnR9bSZz2VzXCbM8515zAKupay8Z3CXKD tUMwC/pGoIOmGs6tAcF3YB0pv7V5fWDFcHW0JQvIfE68VDM9AOIS1P7skh9dLMLatO 5VW6QKj/uE3Rg== From: Arnd Bergmann To: Catalin Marinas , Will Deacon , "Steven Rostedt (Google)" , Mark Rutland , Donglin Peng Cc: Arnd Bergmann , Florent Revest , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: ftrace: fix build error with CONFIG_FUNCTION_GRAPH_TRACER=n Date: Fri, 23 Jun 2023 17:21:55 +0200 Message-Id: <20230623152204.2216297-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230623_082211_507643_79E36A77 X-CRM114-Status: GOOD ( 12.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann It appears that a merge conflict ended up hiding a newly added constant in some configurations: arch/arm64/kernel/entry-ftrace.S: Assembler messages: arch/arm64/kernel/entry-ftrace.S:59: Error: undefined symbol FTRACE_OPS_DIRECT_CALL used as an immediate value FTRACE_OPS_DIRECT_CALL is still used when CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS is enabled, even if CONFIG_FUNCTION_GRAPH_TRACER is disabled, so change the ifdef accordingly. Fixes: 3646970322464 ("arm64: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL") Signed-off-by: Arnd Bergmann Acked-by: Florent Revest Reviewed-by: Randy Dunlap Tested-by: Randy Dunlap # build-tested Acked-by: Catalin Marinas --- arch/arm64/kernel/asm-offsets.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 757d01a68ffd0..5ff1942b04fcf 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -213,9 +213,9 @@ int main(void) DEFINE(FGRET_REGS_X7, offsetof(struct fgraph_ret_regs, regs[7])); DEFINE(FGRET_REGS_FP, offsetof(struct fgraph_ret_regs, fp)); DEFINE(FGRET_REGS_SIZE, sizeof(struct fgraph_ret_regs)); +#endif #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS DEFINE(FTRACE_OPS_DIRECT_CALL, offsetof(struct ftrace_ops, direct_call)); -#endif #endif return 0; }