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 9E6C7EB64DC for ; Fri, 16 Jun 2023 10:27:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230016AbjFPK1H (ORCPT ); Fri, 16 Jun 2023 06:27:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344011AbjFPK0h (ORCPT ); Fri, 16 Jun 2023 06:26:37 -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 BDF693C02; Fri, 16 Jun 2023 03:25:53 -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 09B2363594; Fri, 16 Jun 2023 10:25:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F38D1C433B8; Fri, 16 Jun 2023 10:25:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686911152; bh=3gJBdkkoAodYuniUryayjLAqsHJEVzhZbdczoKm57UI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eNw0yfMea/53qmKDgJ04BlSUJL8G4y18cm+ktFXU68qvA5LNQyYXQuXH5pTOHGcA6 KFMNRBRpttkgk6XjklE4/WKfLCCaNiu9hUQhE0jc0AinxkBEu/nYrCLmCbr3d1f8zL QePVtZ8BqROeMvNzLmqLRIwcNlDPUdr+AEPEV6SUDeUeoYDRnVVQY2iXktpoc+n699 zLtWQOHDHf+5GhNH7hdinz/O6DtulSSrmml+1nQOxBvLTaIhBsyJAvetRifePWiuOH x+lmYjnin1Gl0wqBMNJkkRKe7fOH6u5r4PDo/mCiPbhu5M8afN7+U1aejzq7As5B5F DmiH00aSHtNGA== 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.3 15/30] s390/purgatory: disable branch profiling Date: Fri, 16 Jun 2023 06:25:03 -0400 Message-Id: <20230616102521.673087-15-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230616102521.673087-1-sashal@kernel.org> References: <20230616102521.673087-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.3.8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.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 32573b4f9bd20..cc8cf5abea158 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 += -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