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

Merge pull request #104 from devimc/topic/fixMemConstraints

Browse Source 
kernel/configs: enable swap extension (CONFIG_MEMCG_SWAP)
This commit is contained in:
Peng Tao
2018-08-02 10:09:15 +08:00
committed by GitHub
parent 4af56db0ea 3b18544a99
commit 47835a8fd3
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/configs/arm64_kata_kvm_4.14.x
View File

@@ -49,7 +49,7 @@ CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_DEFAULT_HOSTNAME="kata-container" CONFIG_DEFAULT_HOSTNAME="kata-container"
# CONFIG_SWAP is not set CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE=y
@@ -129,6 +129,8 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
CONFIG_CGROUPS=y CONFIG_CGROUPS=y
CONFIG_PAGE_COUNTER=y CONFIG_PAGE_COUNTER=y
CONFIG_MEMCG=y CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG_SWAP_ENABLED=y
CONFIG_BLK_CGROUP=y CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLK_CGROUP is not set
CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_WRITEBACK=y
@@ -515,6 +517,7 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_ARCH_WANTS_THP_SWAP is not set # CONFIG_ARCH_WANTS_THP_SWAP is not set
# CONFIG_CLEANCACHE is not set # CONFIG_CLEANCACHE is not set
# CONFIG_FRONTSWAP is not set
# CONFIG_CMA is not set # CONFIG_CMA is not set
# CONFIG_ZPOOL is not set # CONFIG_ZPOOL is not set
# CONFIG_ZBUD is not set # CONFIG_ZBUD is not set
@@ -573,6 +576,7 @@ CONFIG_COREDUMP=y
# Power management options # Power management options
# #
# CONFIG_SUSPEND is not set # CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
CONFIG_PM=y CONFIG_PM=y
# CONFIG_PM_DEBUG is not set # CONFIG_PM_DEBUG is not set
CONFIG_PM_CLK=y CONFIG_PM_CLK=y

6
kernel/configs/x86_64_kata_kvm_4.14.x
View File

@@ -66,7 +66,7 @@ CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_LZO is not set # CONFIG_KERNEL_LZO is not set
# CONFIG_KERNEL_LZ4 is not set # CONFIG_KERNEL_LZ4 is not set
CONFIG_DEFAULT_HOSTNAME="kata-container" CONFIG_DEFAULT_HOSTNAME="kata-container"
# CONFIG_SWAP is not set CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE=y
@@ -150,6 +150,8 @@ CONFIG_ARCH_SUPPORTS_INT128=y
CONFIG_CGROUPS=y CONFIG_CGROUPS=y
CONFIG_PAGE_COUNTER=y CONFIG_PAGE_COUNTER=y
CONFIG_MEMCG=y CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG_SWAP_ENABLED=y
CONFIG_BLK_CGROUP=y CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set # CONFIG_DEBUG_BLK_CGROUP is not set
CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_WRITEBACK=y
@@ -519,6 +521,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set
CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_ARCH_WANTS_THP_SWAP=y
# CONFIG_CLEANCACHE is not set # CONFIG_CLEANCACHE is not set
# CONFIG_FRONTSWAP is not set
# CONFIG_CMA is not set # CONFIG_CMA is not set
# CONFIG_ZPOOL is not set # CONFIG_ZPOOL is not set
# CONFIG_ZBUD is not set # CONFIG_ZBUD is not set
@@ -575,6 +578,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
# Power management and ACPI options # Power management and ACPI options
# #
# CONFIG_SUSPEND is not set # CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM is not set # CONFIG_PM is not set
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y

2
kernel/kata_config_version
View File

@@ -1 +1 @@
6 7