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 7C307C001B1 for ; Fri, 16 Jun 2023 10:29:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344779AbjFPK3i (ORCPT ); Fri, 16 Jun 2023 06:29:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344675AbjFPK27 (ORCPT ); Fri, 16 Jun 2023 06:28:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F2C335BE; Fri, 16 Jun 2023 03:26:55 -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 5A6F4635A2; 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 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 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