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

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index cc8df5ae563f15404e2103b37a0c854c3d93ded6..2572bf45ef44421752b9b6c65eab4276335fb26b 100644 (file)
--- 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)