summaryrefslogtreecommitdiff
path: root/libre/linux-libre/config.x86_64
diff options
context:
space:
mode:
Diffstat (limited to 'libre/linux-libre/config.x86_64')
-rw-r--r--libre/linux-libre/config.x86_647
1 files changed, 5 insertions, 2 deletions
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 479c39929..fbc1c7588 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.0 Kernel Configuration
+# Linux/x86_64 3.6.3 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -136,7 +136,10 @@ CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_MEMCG is not set
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
# CONFIG_CGROUP_HUGETLB is not set
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_SCHED=y