diff options
| author | Alistair Delva <adelva@google.com> | 2019-12-23 10:45:42 -0800 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2019-12-23 13:42:44 -0800 |
| commit | 815d877d36c49b5c08d2ccfe2d97af2d6d8128a1 (patch) | |
| tree | 95f4276759e0dd9c6ee7e8e4aa6cfc9ad314cc9e | |
| parent | a713c5aded054c85c63f3bc473ccb9f773e53fac (diff) | |
ANDROID: cuttlefish_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 <adelva@google.com>
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 1 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 276cd1feb3d2..171bbc6811da 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -45,7 +45,6 @@ CONFIG_PREEMPT=y CONFIG_HZ_100=y # CONFIG_SPARSEMEM_VMEMMAP is not set CONFIG_KSM=y -CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_ZSMALLOC=y CONFIG_SECCOMP=y CONFIG_ARMV8_DEPRECATED=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index d55b4f587c0c..637f0a2bc48d 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -50,7 +50,6 @@ CONFIG_X86_MSR=y CONFIG_X86_CPUID=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 -CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_MTRR is not set CONFIG_HZ_100=y CONFIG_KEXEC=y |