From patchwork Mon Jan 9 12:27:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 13093382 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 AF359C54EBD for ; Mon, 9 Jan 2023 12:29:04 +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=X3Ma2dvNXfuuCIRYMZ/PN5j/Li2eWNYNXHQ9vSwT7dU=; b=o8blOAKiiBvdcF aOcKGAw9QdWszfkKmY81utka3tp95Lm+R8AATSTPRGs/zZMQDC1IrtOeCyn9zpZqdb+pjtHKiAipV Ao2BnJR+/wcyfhDB2i4z/OkHVUsUyXUMMDdmbvJdF2CLcrhzT1XxdKUJFVckta4dToNsb9sXWqMdP gSqMTZJ3Ry3cDlwoz1R5mpmaiR2ywYg1GVcOJG7It1HSB0qmDx8iSZWuSr5JGK0rbYTOT6CR9XQF1 MxJfcVzi0MINb/N8XexmpOjLte+LrqqaSoauQns4azhho2BX04oY5nJU/hGxojI9M3KBH/f17wReq xBS5PWkyFzamST3ble1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pErG0-001Dlv-QF; Mon, 09 Jan 2023 12:28:04 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pErFx-001Dkb-D5 for linux-arm-kernel@lists.infradead.org; Mon, 09 Jan 2023 12:28:02 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D1EF41042; Mon, 9 Jan 2023 04:28:38 -0800 (PST) Received: from e126815.warwick.arm.com (e126815.arm.com [10.32.32.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0BD313F67D; Mon, 9 Jan 2023 04:27:54 -0800 (PST) From: James Clark To: linux-arm-kernel@lists.infradead.org, mark.rutland@arm.com Cc: James Clark , Catalin Marinas , Will Deacon , Nathan Chancellor , Nick Desaulniers , Tom Rix , "Steven Rostedt (Google)" , Florent Revest , "Masami Hiramatsu (Google)" , linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH] arm64: Fix build with CC=clang, CONFIG_FTRACE=y and CONFIG_STACK_TRACER=y Date: Mon, 9 Jan 2023 12:27:43 +0000 Message-Id: <20230109122744.1904852-1-james.clark@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230109_042801_527728_FF9AC857 X-CRM114-Status: UNSURE ( 8.51 ) X-CRM114-Notice: Please train this message. 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 commit 45bd8951806e ("arm64: Improve HAVE_DYNAMIC_FTRACE_WITH_REGS selection for clang") fixed the build with the above combination by splitting HAVE_DYNAMIC_FTRACE_WITH_REGS into separate checks for Clang and GCC. commit 26299b3f6ba2 ("ftrace: arm64: move from REGS to ARGS") added the GCC only check "-fpatchable-function-entry=2" back in unconditionally which breaks the build. Remove the unconditional check, because the conditional ones were also updated to _ARGS in the above commit, so they work correctly on their own. Fixes: 26299b3f6ba2 ("ftrace: arm64: move from REGS to ARGS") Signed-off-by: James Clark Reviewed-by: Nathan Chancellor --- arch/arm64/Kconfig | 2 -- 1 file changed, 2 deletions(-) base-commit: 5db568e748f6fb7d0d2e1bff4c2698ad4f50b982 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index cf6d1cd8b6dc..c5ccca26a408 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -184,8 +184,6 @@ config ARM64 select HAVE_DEBUG_KMEMLEAK select HAVE_DMA_CONTIGUOUS select HAVE_DYNAMIC_FTRACE - select HAVE_DYNAMIC_FTRACE_WITH_ARGS \ - if $(cc-option,-fpatchable-function-entry=2) select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY \ if DYNAMIC_FTRACE_WITH_ARGS select HAVE_EFFICIENT_UNALIGNED_ACCESS