summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorValentin Vidic <vvidic@valentin-vidic.from.hr>2021-04-27 22:40:10 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-20 17:00:17 +0300
commit2fdbf6e7baa86917700a73aa334e502efb62219b (patch)
tree603eec0186a4079cd72a39a8f3532852f89b76f0 /arch/s390
parentb29ddd99c14fb494739cdf3a6a7658616eae63a7 (diff)
downloadlinux-2fdbf6e7baa86917700a73aa334e502efb62219b.tar.xz
s390/sclp_vt220: fix console name to match device
[ Upstream commit b7d91d230a119fdcc334d10c9889ce9c5e15118b ] Console name reported in /proc/consoles: ttyS1 -W- (EC p ) 4:65 does not match the char device name: crw--w---- 1 root root 4, 65 May 17 12:18 /dev/ttysclp0 so debian-installer inside a QEMU s390x instance gets confused and fails to start with the following error: steal-ctty: No such file or directory Signed-off-by: Valentin Vidic <vvidic@valentin-vidic.from.hr> Link: https://lore.kernel.org/r/20210427194010.9330-1-vvidic@valentin-vidic.from.hr Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 382d73da134c..93538e63fa03 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -165,7 +165,7 @@ static void __init set_preferred_console(void)
else if (CONSOLE_IS_3270)
add_preferred_console("tty3270", 0, NULL);
else if (CONSOLE_IS_VT220)
- add_preferred_console("ttyS", 1, NULL);
+ add_preferred_console("ttysclp", 0, NULL);
else if (CONSOLE_IS_HVC)
add_preferred_console("hvc", 0, NULL);
}