From 501833cf5539133841ac101ff16d373ceb2b0d4a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 May 2013 14:52:02 +0200 Subject: [PATCH] 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...) --- pkgs/os-specific/linux/kernel/linux-3.7.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.8.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-3.9.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.7.nix b/pkgs/os-specific/linux/kernel/linux-3.7.nix index 1ee2b9d7eda3..8f77334901dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.7.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 diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index b6d6d49be65d..6d077139e329 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 diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index bb990c74186e..7fc42974c56d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.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