s390/traps: do not test MONITOR CALL without CONFIG_BUG
authorIlya Leoshkevich <iii@linux.ibm.com>
Fri, 2 Jul 2021 13:54:55 +0000 (15:54 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Jul 2021 12:36:17 +0000 (14:36 +0200)
[ 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 <iii@linux.ibm.com>
Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/s390/kernel/traps.c

index 8d1e8a1..16934fa 100644 (file)
@@ -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"