From 0d779e0a36e9f4500d34c33667916b28e3026575 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 18 Jun 2013 11:45:39 -0700 Subject: [PATCH] fix(cros-kernel/x86_64_defconfig) enable CONFIG_MEMCG_SWAP_ENABLED This is requested so that cgroups can swap properly. --- .../coreos-overlay/eclass/cros-kernel/x86_64_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig index a9cd9bd183..ee5a6ace72 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig +++ b/sdk_container/src/third_party/coreos-overlay/eclass/cros-kernel/x86_64_defconfig @@ -146,7 +146,7 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_SWAP_ENABLED=y CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set CONFIG_CGROUP_PERF=y