From fa3cc11118de1205fea828af1c754a76c711096b Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Wed, 5 Feb 2025 00:41:17 -0800 Subject: [PATCH] ANDROID: GKI: Enable CONFIG_MEMFD_ASHMEM_SHIM Enable memfd-ashmem compatibility support. Bug: 111903542 Change-Id: Ia4685272b2f64db737697a3e3c1640d110060111 Signed-off-by: Isaac J. Manjarres --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 99fe0c1c0815..a91c46394533 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -129,6 +129,7 @@ CONFIG_CMA_DEBUGFS=y CONFIG_CMA_AREAS=32 # CONFIG_ZONE_DMA is not set CONFIG_ZONE_DEVICE=y +CONFIG_MEMFD_ASHMEM_SHIM=y CONFIG_ANON_VMA_NAME=y CONFIG_USERFAULTFD=y CONFIG_LRU_GEN=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 801559e4527c..1ba04adb3f0c 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -119,6 +119,7 @@ CONFIG_CMA_DEBUGFS=y CONFIG_CMA_AREAS=16 # CONFIG_ZONE_DMA is not set CONFIG_ZONE_DEVICE=y +CONFIG_MEMFD_ASHMEM_SHIM=y CONFIG_ANON_VMA_NAME=y CONFIG_USERFAULTFD=y CONFIG_LRU_GEN=y