From d6af8334cd4d3a77b24fd2fdb0c9f83d38d1a849 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Thu, 27 Feb 2020 12:12:39 -0800 Subject: [PATCH] ANDROID: gki: Enable BINFMT_MISC as part of GKI Bug: 150328771 Signed-off-by: Ram Muthiah Test: Treehugger Change-Id: I2e9ba3a214295a63e3a0d4cc3407f93644f00db2 --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + cuttlefish.fragment | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 83bbf1f595ce..8319a98394d6 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -87,6 +87,7 @@ CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_GKI_HACKS_TO_FIX=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_MISC=y CONFIG_MEMORY_HOTPLUG=y CONFIG_CMA=y CONFIG_CMA_AREAS=16 diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index d5f34e606fe1..14c5f01df3e9 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -64,6 +64,7 @@ CONFIG_BLK_INLINE_ENCRYPTION=y CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y CONFIG_GKI_HACKS_TO_FIX=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_MISC=y CONFIG_CMA=y CONFIG_CMA_AREAS=16 CONFIG_ZSMALLOC=y diff --git a/cuttlefish.fragment b/cuttlefish.fragment index 9c59fb302cbc..cdc0831d4e51 100644 --- a/cuttlefish.fragment +++ b/cuttlefish.fragment @@ -1,5 +1,4 @@ CONFIG_CPUFREQ_DUMMY=m -CONFIG_BINFMT_MISC=m CONFIG_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS=m CONFIG_GNSS_CMDLINE_SERIAL=m