Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[S390] console: allow vt220 console to be the only console
Fix console detection logic to support configurations in which the
vt220 console is the only available Linux console.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
authored by Peter Oberparleiter and committed by Martin Schwidefsky 8c0933ee 2bc89b5e
+5
-5
arch/s390/kernel/setup.c
+5
-5
arch/s390/kernel/setup.c
···
145
145
146
146
static int __init conmode_setup(char *str)
147
147
{
148
-
#if defined(CONFIG_SCLP_CONSOLE)
148
+
#if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE)
149
149
if (strncmp(str, "hwc", 4) == 0 || strncmp(str, "sclp", 5) == 0)
150
150
SET_CONSOLE_SCLP;
151
151
#endif
···
183
183
*/
184
184
cpcmd("TERM CONMODE 3215", NULL, 0, NULL);
185
185
if (ptr == NULL) {
186
-
#if defined(CONFIG_SCLP_CONSOLE)
186
+
#if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE)
187
187
SET_CONSOLE_SCLP;
188
188
#endif
189
189
return;
···
193
193
SET_CONSOLE_3270;
194
194
#elif defined(CONFIG_TN3215_CONSOLE)
195
195
SET_CONSOLE_3215;
196
-
#elif defined(CONFIG_SCLP_CONSOLE)
196
+
#elif defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE)
197
197
SET_CONSOLE_SCLP;
198
198
#endif
199
199
} else if (strncmp(ptr + 8, "3215", 4) == 0) {
···
201
201
SET_CONSOLE_3215;
202
202
#elif defined(CONFIG_TN3270_CONSOLE)
203
203
SET_CONSOLE_3270;
204
-
#elif defined(CONFIG_SCLP_CONSOLE)
204
+
#elif defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE)
205
205
SET_CONSOLE_SCLP;
206
206
#endif
207
207
}
···
212
212
SET_CONSOLE_3270;
213
213
#endif
214
214
} else {
215
-
#if defined(CONFIG_SCLP_CONSOLE)
215
+
#if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE)
216
216
SET_CONSOLE_SCLP;
217
217
#endif
218
218
}