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
commit7ffc16a44d58f74d4df14fa0804f3c6fe755eba5 (patch)
tree8b7584ef38a0459e4d2904ac1687fb9b07a2a4e8
parent59da8842dd7f400267600204203491dc439b95b5 (diff)
downloadmaster-187ad058-7ffc16a44d58f74d4df14fa0804f3c6fe755eba5.tar.gz
master-187ad058-7ffc16a44d58f74d4df14fa0804f3c6fe755eba5.tar.bz2
master-187ad058-7ffc16a44d58f74d4df14fa0804f3c6fe755eba5.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46024 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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)