github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 17:22:33 +00:00
Code Issues Projects Releases Wiki Activity

kernel: disable ZSWAP, remove zVM hypervisor on s390x

Browse Source 
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 <tmhoang@linux.ibm.com>
This commit is contained in:
Tuan Hoang 2019-04-04 12:42:57 +02:00
parent 9f86c31e10
commit ebefdea1a7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/configs/s390_kata_kvm_4.19.x
View File

@ -370,7 +370,7 @@ CONFIG_HAVE_PNETID=y
CONFIG_PFAULT=y CONFIG_PFAULT=y
# CONFIG_CMM is not set # CONFIG_CMM is not set
# CONFIG_APPLDATA_BASE 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=y
CONFIG_HAVE_KVM_IRQCHIP=y CONFIG_HAVE_KVM_IRQCHIP=y
CONFIG_HAVE_KVM_IRQFD=y CONFIG_HAVE_KVM_IRQFD=y
@ -610,10 +610,9 @@ CONFIG_CMA=y
# CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUGFS is not set
CONFIG_CMA_AREAS=7 CONFIG_CMA_AREAS=7
# CONFIG_MEM_SOFT_DIRTY is not set # CONFIG_MEM_SOFT_DIRTY is not set
CONFIG_ZSWAP=y # CONFIG_ZSWAP is not set
CONFIG_ZPOOL=y # CONFIG_ZPOOL is not set
# CONFIG_ZBUD is not set # CONFIG_ZBUD is not set
# CONFIG_Z3FOLD is not set
# CONFIG_ZSMALLOC is not set # CONFIG_ZSMALLOC is not set
# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
CONFIG_IDLE_PAGE_TRACKING=y CONFIG_IDLE_PAGE_TRACKING=y
@ -859,7 +858,6 @@ CONFIG_ALLOW_DEV_COREDUMP=y
# CONFIG_DEBUG_DEVRES is not set # CONFIG_DEBUG_DEVRES is not set
# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
CONFIG_SYS_HYPERVISOR=y
CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_GENERIC_CPU_VULNERABILITIES=y
# CONFIG_DMA_CMA is not set # CONFIG_DMA_CMA is not set
@ -1399,7 +1397,7 @@ CONFIG_VMCP=y
CONFIG_VMCP_CMA_SIZE=4 CONFIG_VMCP_CMA_SIZE=4
# CONFIG_MONREADER is not set # CONFIG_MONREADER is not set
# CONFIG_MONWRITER is not set # CONFIG_MONWRITER is not set
CONFIG_S390_VMUR=y # CONFIG_S390_VMUR is not set
# CONFIG_XILLYBUS is not set # CONFIG_XILLYBUS is not set
# CONFIG_RANDOM_TRUST_CPU is not set # CONFIG_RANDOM_TRUST_CPU is not set

2
kernel/kata_config_version
View File

@ -1 +1 @@
31 32