ascend inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I90WBX CVE: NA

-------------------------------------------------

The enable_oom_killer feature is only used on ascend platform, make its config depends on ASCEND_FEATURE.

Signed-off-by: Yuan Can yuancan@huawei.com --- arch/x86/configs/openeuler_defconfig | 1 - mm/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 77f0c7ae79c1..d4027ab5893a 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -1171,7 +1171,6 @@ CONFIG_LRU_GEN=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y -# CONFIG_ASCEND_OOM is not set # CONFIG_PAGE_CACHE_LIMIT is not set CONFIG_DYNAMIC_POOL=y CONFIG_ETMEM_SCAN=m diff --git a/mm/Kconfig b/mm/Kconfig index f45bc11c1cb2..56f80e2e3a6f 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1314,6 +1314,7 @@ config SHARE_POOL

config ASCEND_OOM bool "Enable support for disable oom killer" + depends on ASCEND_FEATURES default n help In some cases we hopes that the oom will not kill the process when it occurs,