aboutsummarylogtreecommitdiffstats
path: root/config.x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'config.x86_64')
-rw-r--r--config.x86_647
1 files changed, 4 insertions, 3 deletions
diff --git a/config.x86_64 b/config.x86_64
index 542d9b1053e5..f4d3d890b059 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.0.0-1 Kernel Configuration
+# Linux/x86 4.0.4-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -150,8 +150,9 @@ CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_PAGE_COUNTER=y
CONFIG_MEMCG=y
-# CONFIG_MEMCG_SWAP is not set
-# CONFIG_MEMCG_KMEM is not set
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
CONFIG_CGROUP_HUGETLB=y
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y