From c74e42994fb0d2a360042a759147cc59fff07f51 Mon Sep 17 00:00:00 2001 From: Jing Xiangfeng Date: Tue, 6 Jul 2021 16:51:03 +0800 Subject: [PATCH] memcg: enable CONFIG_MEMCG_QOS by default hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I3ZN3O CVE: NA -------------------------------------- enable CONFIG_MEMCG_QOS to support memcg OOM priority. Signed-off-by: Jing Xiangfeng Reviewed-by: Liu Shixin Signed-off-by: Zheng Zengkai --- arch/arm64/configs/openeuler_defconfig | 1 + arch/x86/configs/openeuler_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index b60bed463a8e..21e087233caa 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -1006,6 +1006,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y +CONFIG_MEMCG_QOS=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index db039bbe8d29..2981e8c43d00 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -988,6 +988,7 @@ CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_THP_SWAP=y CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y +CONFIG_MEMCG_QOS=y # CONFIG_CMA is not set CONFIG_MEM_SOFT_DIRTY=y CONFIG_ZSWAP=y -- GitLab