github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-02 00:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #248 from alicefr/s390_configs

Browse Source 
kernel: s390 configs
This commit is contained in:
Jose Carlos Venegas Munoz 2018-11-26 17:45:20 -06:00 committed by GitHub
commit 64eb46e901
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 633 additions and 1799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2395
kernel/configs/s390_kata_kvm_4.14.x
View File

File diff suppressed because it is too large Load Diff

2
kernel/kata_config_version
View File

@ -1 +1 @@
17
18

35
kernel/patches/0003-serial-forbid-8250-on-s390.patch Normal file
View File

@ -0,0 +1,35 @@
From 897514eadc2dd1b7cb71099b0495752bdf21390d Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Tue, 12 Dec 2017 09:08:35 +0100
Subject: [PATCH 19/21] serial: forbid 8250 on s390
Using "make kvmconfig" results in a potentially unusable linux image
on s390. The reason is that both the (default on s390) sclp consoles
as well as the 8250 console register a ttyS<x> as console. Since there
will be no 8250 on s390 let's fence 8250. This will ensure that there
is always a working sclp console.
Reported-by: Alice Frosi <alice@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 1598e38c0770b08c4d6371b670f9ee61a42ec68b)
---
drivers/tty/serial/8250/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
index a5c0ef1e7695..16b1496e6105 100644
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
@@ -5,6 +5,7 @@
config SERIAL_8250
tristate "8250/16550 and compatible serial support"
+ depends on !S390
select SERIAL_CORE
---help---
This selects whether you want to include the driver for the standard
--
2.18.0