diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-22 23:13:39 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-22 23:13:39 -0200 |
| commit | 151c8e229d123f90425aae449e9ebc64e1844410 (patch) | |
| tree | 5c6bfb3455b0bbffe06ae6ad789ec7a90548993e /libre/linux-libre/config.i686 | |
| parent | 83a14844ae5b2b650b15453d8e9441a352e1a3a8 (diff) | |
| download | abslibre-151c8e229d123f90425aae449e9ebc64e1844410.tar.gz abslibre-151c8e229d123f90425aae449e9ebc64e1844410.tar.bz2 abslibre-151c8e229d123f90425aae449e9ebc64e1844410.zip | |
linux-libre-3.6.3-1: updating version, adding module initialisation patches and readding memgroups
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 |