diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-27 12:00:51 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-27 12:00:51 -0400 |
| commit | a957024315d06271ceb557b40512d728a15da2b4 (patch) | |
| tree | c5561790c4d67e2c1d4ba45392e160b18508463f /libre/linux-libre/config.i686 | |
| parent | df1af774dc8dc6b26467efb84b04295d2726b8bb (diff) | |
| parent | df0201976210a03cbc15d5580a609a62e8cc8b05 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre/config.i686')
| -rwxr-xr-x | libre/linux-libre/config.i686 | 7 |
1 files changed, 5 insertions, 2 deletions
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 |