From b4e6f1a6fc2c8406a016b617a70e469f88ff5a22 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Mon, 23 Dec 2019 10:45:42 -0800 Subject: [PATCH] ANDROID: gki_defconfig: Disable TRANSPARENT_HUGEPAGE Fix conflict between jemalloc/scudo and MADV_NOHUGEPAGE by disabling the transparent hugepage support. It has also been suggested that this feature can make VM behavior less predictable. Bug: 131119917 Change-Id: I17556838fbf1f893e26c5658ee95b4e3b16b10ad Signed-off-by: Alistair Delva --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index d0d360e66588..fd58c2a7dea3 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -85,7 +85,6 @@ CONFIG_GKI_HACKS_TO_FIX=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=m CONFIG_MEMORY_HOTPLUG=y -CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_CMA=y CONFIG_CMA_AREAS=16 CONFIG_ZSMALLOC=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index bcda99d95548..2ac64a8ae134 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -59,7 +59,6 @@ CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_GKI_HACKS_TO_FIX=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=m -CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_CMA=y CONFIG_CMA_AREAS=16 CONFIG_ZSMALLOC=y