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 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 BB59CEB64D7 for ; Fri, 30 Jun 2023 16:03:18 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3FNxWRD6um4cZejv+oJxTsWYfVqqeCz6f0C+oXNzDao=; b=o4zHowrBTjUCi/ p9aFOtBegdKFvOhfvo9vKIWMp2D2EN8kEDLA8xUliRz+boxni9Y5i+M6pIWw3HsDGFMzlwZ28JID9 CXFJTkMY5oq/n2d31Qgs4G278Lw7JT/KtRyLe1J2gzOm3yjG36IdxpvaTwjYgXA8Wgn85TpwBSEMk t+A17cFRZoCwbhpaqsWc9TIUgVYclOWRX7muUNDWW8HIUHer0TTNLd+kwb9IVe6prGZBc11YA07eo RHSN/4/TIVOAiMLCbMrOyyCjWBXBXL+tln5FptWzuVui0nUNJlfN+KVely2f2qYIDJFjMJxU+LpHi 7n+ibipwBRSaBHriLQuA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qFGa8-0040ar-2E; Fri, 30 Jun 2023 16:02:48 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qFGa6-0040a6-1r for linux-arm-kernel@lists.infradead.org; Fri, 30 Jun 2023 16:02:48 +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 33E1F61757; 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-Disposition: inline In-Reply-To: <20230623152204.2216297-1-arnd@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230630_090246_655153_BC6C93AA X-CRM114-Status: GOOD ( 21.05 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel