Merge tag 'usb-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 4dc783023e434894a495762167341e30d51e5874..9bd50ba8253f73ef4c5d064416129f6ce09ac1ca 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -708,6 +708,11 @@ config MEMCG_SWAP_ENABLED
          select this option (if, for some reason, they need to disable it
          then swapaccount=0 does the trick).
 
+config MEMCG_KMEM
+       bool
+       depends on MEMCG && !SLOB
+       default y
+
 config BLK_CGROUP
        bool "IO controller"
        depends on BLOCK