diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-15 14:52:02 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-15 14:53:15 +0200 |
| commit | 501833cf5539133841ac101ff16d373ceb2b0d4a (patch) | |
| tree | 75a95308bb1ae7026f62fe5d398194c07e92cf95 /pkgs/os-specific/linux/kernel/linux-3.8.nix | |
| parent | d5c8f4cb6070ed3b66856c21f4c2c7d70e3446ed (diff) | |
linux: Re-enable the memory resource controller
We accidentally lost this in Linux >= 3.5 because the kernel options were renamed. (Probably an argument for not using "?" in the kernel config...)
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-3.8.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.8.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index b6d6d49be65d3..6d077139e329b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -215,8 +215,8 @@ let # Linux Containers RT_GROUP_SCHED? y CGROUP_DEVICE? y - CGROUP_MEM_RES_CTLR? y - CGROUP_MEM_RES_CTLR_SWAP? y + MEMCG? y + MEMCG_SWAP? y DEVPTS_MULTIPLE_INSTANCES? y # Enable staging drivers. These are somewhat experimental, but |