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 X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16166C47E54 for ; Wed, 14 Jul 2021 19:52:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0850613C3 for ; Wed, 14 Jul 2021 19:52:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241917AbhGNTyv (ORCPT ); Wed, 14 Jul 2021 15:54:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:46536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240374AbhGNTto (ORCPT ); Wed, 14 Jul 2021 15:49:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AF5CC6143F; Wed, 14 Jul 2021 19:45:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291909; bh=D9e8Y4J/7pUkndTCimmJILrmK4V573fBUDB3wSvbpJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bw94Zakt0GmCpJBa/Nl51oCiXsFPgEv4bfYsgEXX4Vhsb3yhUDAvnsY7Q89vsn4ZC AvA/9IJtYRkuy0HR//RTz77/kdD7hFZWyCRsSA6UU5ymwSFFa7/cVY0PftjQG/7qUi SWIA1X58u3uw2qrWROTqmZiWSuTfrNZWfRqsTl3ZZpaFG6FO/eqqexkQ1YeZPl7rA2 BQdLZ/xSxC4R1ZPsWm+eyaq7Njimap7xzyPf7UxzFTUMjflfEv9QqfyNts38VymSh2 8gh08dAasLoWaa3dfUXcR0qsNmFQuP3wHm4aswUMP2clME9/h8W6t7h6Yst9O9BJfb 6i3CaBBeRkozw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ilya Leoshkevich , Heiko Carstens , Vasily Gorbik , Sasha Levin , linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 86/88] s390/traps: do not test MONITOR CALL without CONFIG_BUG Date: Wed, 14 Jul 2021 15:43:01 -0400 Message-Id: <20210714194303.54028-86-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194303.54028-1-sashal@kernel.org> References: <20210714194303.54028-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilya Leoshkevich [ Upstream commit b8e9cc20b808e26329090c19ff80b7f5098e98ff ] tinyconfig fails to boot, because without CONFIG_BUG report_bug() always returns BUG_TRAP_TYPE_BUG, which causes mc 0,0 in test_monitor_call() to panic. Fix by skipping the test without CONFIG_BUG. Signed-off-by: Ilya Leoshkevich Reviewed-by: Heiko Carstens Signed-off-by: Vasily Gorbik Signed-off-by: Sasha Levin --- arch/s390/kernel/traps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c index 8d1e8a1a97df..16934fa19069 100644 --- a/arch/s390/kernel/traps.c +++ b/arch/s390/kernel/traps.c @@ -272,6 +272,8 @@ static void __init test_monitor_call(void) { int val = 1; + if (!IS_ENABLED(CONFIG_BUG)) + return; asm volatile( " mc 0,0\n" "0: xgr %0,%0\n" -- 2.30.2