From mboxrd@z Thu Jan 1 00:00:00 1970 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 D6E61EB64DA for ; Fri, 30 Jun 2023 16:02:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230364AbjF3QC6 (ORCPT ); Fri, 30 Jun 2023 12:02:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232094AbjF3QCx (ORCPT ); Fri, 30 Jun 2023 12:02:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE72C3C2A for ; Fri, 30 Jun 2023 09:02:44 -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 37B4C61798 for ; Fri, 30 Jun 2023 16:02:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A283C433C0; Fri, 30 Jun 2023 16:02:41 +0000 (UTC) Date: Fri, 30 Jun 2023 17:02:39 +0100 From: Catalin Marinas To: Arnd Bergmann Cc: Will Deacon , "Steven Rostedt (Google)" , Mark Rutland , Donglin Peng , Arnd Bergmann , Florent Revest , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arm64: ftrace: fix build error with CONFIG_FUNCTION_GRAPH_TRACER=n Message-ID: References: <20230623152204.2216297-1-arnd@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230623152204.2216297-1-arnd@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 23, 2023 at 05:21:55PM +0200, Arnd Bergmann wrote: > 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 > --- > 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; > } Acked-by: Catalin Marinas Steven, since the fixed commit went in via your tree, could you please pick this up as well for -rc1? Otherwise I'll queue it for -rc2 once the ftrace changes turn up in -rc1. Thanks. -- Catalin