From 151c8e229d123f90425aae449e9ebc64e1844410 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 22 Oct 2012 23:13:39 -0200 Subject: linux-libre-3.6.3-1: updating version, adding module initialisation patches and readding memgroups --- libre/linux-libre/config.i686 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libre/linux-libre/config.i686') diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index e553c3d44..6533b0402 100755 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.6.0 Kernel Configuration +# Linux/i386 3.6.3 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -134,7 +134,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 -- cgit v1.2.3