diff --git a/arch/arm64/configs/armdesktop_defconfig b/arch/arm64/configs/armdesktop_defconfig index 0728934c1800..c4f9356328fc 100644 --- a/arch/arm64/configs/armdesktop_defconfig +++ b/arch/arm64/configs/armdesktop_defconfig @@ -15,7 +15,7 @@ CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_CPU_MAX_BUF_SHIFT=15 -#CONFIG_MEMCG=y +CONFIG_MEMCG=y CONFIG_BLK_CGROUP=y CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y diff --git a/init/Kconfig b/init/Kconfig index 22912631d79b..c1913080537d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -916,7 +916,7 @@ config MEMCG_SWAP config MEMCG_KMEM bool depends on MEMCG && !SLOB - default y + default n config BLK_CGROUP bool "IO controller"