From c1f8242e82b503f30c13f9f03cd15bd5e57028e1 Mon Sep 17 00:00:00 2001 From: Tuan Hoang Date: Mon, 25 Feb 2019 19:41:12 +0100 Subject: [PATCH 1/2] kernel: update to 4.19.24 on s390x, remove USB support Remove CONFIG_USB_SUPPORT because s390x doesn't do USB. Fixes #360 Signed-off-by: Tuan Hoang --- kernel/configs/s390_kata_kvm_4.19.x | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/kernel/configs/s390_kata_kvm_4.19.x b/kernel/configs/s390_kata_kvm_4.19.x index d76de886e2..e1896df95e 100644 --- a/kernel/configs/s390_kata_kvm_4.19.x +++ b/kernel/configs/s390_kata_kvm_4.19.x @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 4.19.8 Kernel Configuration +# Linux/s390 4.19.24 Kernel Configuration # # -# Compiler: gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 +# Compiler: gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0 # CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=70300 @@ -1499,22 +1499,7 @@ CONFIG_BCMA_POSSIBLE=y # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_SOUND is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_ARCH_HAS_HCD=y -# CONFIG_USB is not set -CONFIG_USB_PCI=y - -# -# USB port drivers -# - -# -# USB Physical Layer drivers -# -# CONFIG_NOP_USB_XCEIV is not set -# CONFIG_USB_GADGET is not set -# CONFIG_TYPEC is not set -# CONFIG_USB_ULPI_BUS is not set +# CONFIG_USB_SUPPORT is not set # CONFIG_UWB is not set # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set From 7839a5c276d91afe7e66b97d63c9101cb1fdfcd4 Mon Sep 17 00:00:00 2001 From: Tuan Hoang Date: Mon, 4 Mar 2019 13:41:56 +0100 Subject: [PATCH 2/2] kernel: CPU hotplug on s390x Add CONFIG_CFS_BANDWIDTH so CPU hotplug feature works on s390x. Note that CPU hot-unplug does not work yet due to limitations in qemu s390x. Fixes #360 Signed-off-by: Tuan Hoang --- kernel/configs/s390_kata_kvm_4.19.x | 2 +- kernel/kata_config_version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/configs/s390_kata_kvm_4.19.x b/kernel/configs/s390_kata_kvm_4.19.x index e1896df95e..71fc3ebbf6 100644 --- a/kernel/configs/s390_kata_kvm_4.19.x +++ b/kernel/configs/s390_kata_kvm_4.19.x @@ -112,7 +112,7 @@ CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y -# CONFIG_CFS_BANDWIDTH is not set +CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 7273c0fa8c..6f4247a625 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -25 +26