From nobody Sat Feb 7 22:01:53 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 2A0ACEB64D7 for ; Fri, 23 Jun 2023 15:22:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231824AbjFWPW2 (ORCPT ); Fri, 23 Jun 2023 11:22:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232376AbjFWPWM (ORCPT ); Fri, 23 Jun 2023 11:22:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45FDD19B for ; Fri, 23 Jun 2023 08:22:11 -0700 (PDT) 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 D4B9F61A97 for ; 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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_DIR= ECT_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: Catalin Marinas Acked-by: Florent Revest Reviewed-by: Randy Dunlap Tested-by: Randy Dunlap # build-tested --- 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-offset= s.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; } --=20 2.39.2