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 BFB1CEB64D9 for ; Tue, 4 Jul 2023 14:00:36 +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:References:In-Reply-To: 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=fQaYxBax+tYc/yRTDB5HRPHJ5lAUydFWuwHpSzpywzk=; b=XJXrdkPaP3bCae axp3D0psCO7Dy6cMYMRwAwemQAIZ+sKr49h+IpqCz895YNiv5mEhZosPVhrsO8LSikVbTgJwCt1qA oYmhfPccOVRLXzYMi8XDlAT8062ZtQgWvgYOWgIMeHBRtsx5VN0Wq+thbO15ypomag8RUTgPxUptg 8R+tdhr/hPJuoZSnyOHReZbB7InqxLNHG4xqNVWJ89y1SSYleybQ9mZqpaA4Jka9J2DEz5KYxAKLH MhzSg02L978N2g9lFGf6XaT0p9aU/XP63JlJffegEFV1sKMX6ZP/Ang/YkfwLZJhKl3AxmvUnSF5F sOrU4ifuDB/sYBhF8oew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qGgZX-00DSSq-3D; Tue, 04 Jul 2023 14:00:04 +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 1qGgZU-00DSPc-2p for linux-arm-kernel@lists.infradead.org; Tue, 04 Jul 2023 14:00:02 +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 9069B61261; Tue, 4 Jul 2023 13:59:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEC5BC433C7; Tue, 4 Jul 2023 13:59:57 +0000 (UTC) Date: Tue, 4 Jul 2023 09:59:53 -0400 From: Steven Rostedt To: Catalin Marinas Cc: Arnd Bergmann , Will Deacon , 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: <20230704095953.6665eaf6@rorschach.local.home> In-Reply-To: References: <20230623152204.2216297-1-arnd@kernel.org> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230704_070000_975782_46C8FB0D X-CRM114-Status: GOOD ( 17.47 ) 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, 30 Jun 2023 17:02:39 +0100 Catalin Marinas wrote: > > 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. I'm working on a fixes pull request for Linus. I'll apply this to it and start my testing on it. I should have a pull request to Linus before the end of the week. -- Steve _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel