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 8943FEB64DB for ; Fri, 16 Jun 2023 10:27:07 +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:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=h2mz4k6s2I8spSg+8Cdhg/PxeAQA4WtZCHxCpOghHdM=; b=odEPICU6hhs5/j E4HyMwDDXmtNUwMVUxX/sfrVKiL0nFy30JhmBHB8IUJq7REisCev/nfOPJ/WbNwJ6fTMeFTA7yDIL Biklaoc5wIQvu0psqG/Q6XaIbCKIZ2X4WIjsPlBmLELSUkWtNIcdj+VzvVKMHRPBln2vScstMMJPQ IKn1yuizSI2+2v4Yx2KJBSt6Qy1/NdxKvjMJzVU1bMCZYX54usPe8FOMBBQJ6shePAr263IOdVUCj 7wWVQ4AQqhfEmmFsjfzejKRr25NJgPGQpPCxSyDuAfx5cSe0T7CvJ4uosEOhfLDVbhJoe/aBSeP9g 6tiYVDDj418rUVNjh91g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qA6fT-0001dt-0U; Fri, 16 Jun 2023 10:26:59 +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 1qA6fP-0001bZ-2o for linux-riscv@lists.infradead.org; Fri, 16 Jun 2023 10:26:57 +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 5907962DD8; Fri, 16 Jun 2023 10:26:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C034C433C0; Fri, 16 Jun 2023 10:26:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686911214; bh=s91xc+b49aRIeahADLlpFRGHjYPIxXCRT0Db06lUIgI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RfHOEfdw07EW+/ZlzRuD5PKZyz+5rMR5z4tdoNHaA/JUO+r4/qaAhtwS9grfqrvtU PoJL+IQlpBghJhfwvCWta+qQfSEdngbdB+xCn6grUxXu5dSEsXo+0xyf4qqgtESvD9 PdmDzA9fDMRfr7CPwTpv1AUCGB1TyvxfL+IKwmIJadcY+Hx2HiL1DfeotafxkTDdAW 4cVK8ooPOwiZMePDwbJ2hxG+LBnsQg6lWiqC9YB8okgJCL1TiLxLf2IuxdlVViU2MF RZfu6FVxNP2+gdIcz+70i/qFaWU60f2K4gYcDtLq42iqKxK5w+GtY7QuBxqqNe3TVk QGQ+rKEYb/HIA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Gordeev , Vasily Gorbik , Sasha Levin , hca@linux.ibm.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, masahiroy@kernel.org, nathan@kernel.org, svens@linux.ibm.com, linux-s390@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 14/26] s390/purgatory: disable branch profiling Date: Fri, 16 Jun 2023 06:26:11 -0400 Message-Id: <20230616102625.673454-14-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230616102625.673454-1-sashal@kernel.org> References: <20230616102625.673454-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.34 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230616_032655_946877_79FFA0BA X-CRM114-Status: UNSURE ( 7.69 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Alexander Gordeev [ Upstream commit 03c5c83b70dca3729a3eb488e668e5044bd9a5ea ] Avoid linker error for randomly generated config file that has CONFIG_BRANCH_PROFILE_NONE enabled and make it similar to riscv, x86 and also to commit 4bf3ec384edf ("s390: disable branch profiling for vdso"). Reviewed-by: Vasily Gorbik Signed-off-by: Alexander Gordeev Signed-off-by: Sasha Levin --- arch/s390/purgatory/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile index d237bc6841cb8..4cbf306b8181f 100644 --- a/arch/s390/purgatory/Makefile +++ b/arch/s390/purgatory/Makefile @@ -26,6 +26,7 @@ KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common KBUILD_CFLAGS += -fno-stack-protector +KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING KBUILD_CFLAGS += $(CLANG_FLAGS) KBUILD_CFLAGS += $(call cc-option,-fno-PIE) KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS)) -- 2.39.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv