From 24aa9e69ac4eef591f9aa3ae91934b5bd044f0f7 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 18 Jun 2015 06:39:00 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46024 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- config/Config-kernel.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- 2.11.0