From ebefdea1a76a50adde43901697e98b5619c60f9d Mon Sep 17 00:00:00 2001 From: Tuan Hoang Date: Thu, 4 Apr 2019 12:42:57 +0200 Subject: [PATCH] kernel: disable ZSWAP, remove zVM hypervisor on s390x Unless we run kata VM as a hypervisor, we may need CONFIG_S390_HYPFS_FS and CONFIG_SYS_HYPERVISOR. CONFIG_S390_VMUR is for z/VM hypvervisor. Remove CONFIG_ZSWAP and its dependencies to match other arches. Fixes: #421 Signed-off-by: Tuan Hoang --- kernel/configs/s390_kata_kvm_4.19.x | 10 ++++------ kernel/kata_config_version | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/kernel/configs/s390_kata_kvm_4.19.x b/kernel/configs/s390_kata_kvm_4.19.x index 71fc3ebbf6..b0857b1242 100644 --- a/kernel/configs/s390_kata_kvm_4.19.x +++ b/kernel/configs/s390_kata_kvm_4.19.x @@ -370,7 +370,7 @@ CONFIG_HAVE_PNETID=y CONFIG_PFAULT=y # CONFIG_CMM is not set # CONFIG_APPLDATA_BASE is not set -CONFIG_S390_HYPFS_FS=y +# CONFIG_S390_HYPFS_FS is not set CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQFD=y @@ -610,10 +610,9 @@ CONFIG_CMA=y # CONFIG_CMA_DEBUGFS is not set CONFIG_CMA_AREAS=7 # CONFIG_MEM_SOFT_DIRTY is not set -CONFIG_ZSWAP=y -CONFIG_ZPOOL=y +# CONFIG_ZSWAP is not set +# CONFIG_ZPOOL is not set # CONFIG_ZBUD is not set -# CONFIG_Z3FOLD is not set # CONFIG_ZSMALLOC is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set CONFIG_IDLE_PAGE_TRACKING=y @@ -859,7 +858,6 @@ CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_DEBUG_DEVRES is not set # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set -CONFIG_SYS_HYPERVISOR=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y # CONFIG_DMA_CMA is not set @@ -1399,7 +1397,7 @@ CONFIG_VMCP=y CONFIG_VMCP_CMA_SIZE=4 # CONFIG_MONREADER is not set # CONFIG_MONWRITER is not set -CONFIG_S390_VMUR=y +# CONFIG_S390_VMUR is not set # CONFIG_XILLYBUS is not set # CONFIG_RANDOM_TRUST_CPU is not set diff --git a/kernel/kata_config_version b/kernel/kata_config_version index e85087affd..f5c89552bd 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -31 +32