aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-06-18 06:39:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-06-18 06:39:00 +0000
commitb3d81b2decf6097f08128a154153d8869cbbf34c (patch)
tree7d4eaca6c44ba7237b218d0650823e6cbdb65067
parentd494adc396fba66889f11f85054b885a21e13a4c (diff)
downloadupstream-b3d81b2decf6097f08128a154153d8869cbbf34c.tar.gz
upstream-b3d81b2decf6097f08128a154153d8869cbbf34c.tar.bz2
upstream-b3d81b2decf6097f08128a154153d8869cbbf34c.zip
kernel: mitigate cgroups config dependency changes
Memory Resource Controller no longer depends on Resource counters since Kernel version 4.0. 3.18 is the only still supported version needing Resource counters for MEMCG, thus declare the dependency only for that version. Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 46024
-rw-r--r--config/Config-kernel.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index cc8df5ae56..2572bf45ef 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -300,7 +300,7 @@ if KERNEL_CGROUPS
config KERNEL_MEMCG
bool "Memory Resource Controller for Control Groups"
default n
- depends on KERNEL_RESOURCE_COUNTERS
+ depends on KERNEL_RESOURCE_COUNTERS || !LINUX_3_18
help
Provides a memory resource controller that manages both anonymous
memory and page cache. (See Documentation/cgroups/memory.txt)