From 811cea558ee8a321fdfa5051549ebf76b4f6cacb Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Mon, 1 Nov 2021 15:04:31 -0700 Subject: [PATCH] ANDROID: Allow the deferred-free library heap to be compiled into the GKI The deferred-free library heap can be useful for modular implementations of the system heap, so compile it as a part of the GKI for arm64 and x86. Bug: 194472281 Change-Id: Iedd85682a90980b26a2f9aac0a53fcf4e1da219e Signed-off-by: Isaac J. Manjarres --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + drivers/dma-buf/heaps/Kconfig | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 3574753c4f2b..30ba0112581e 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -508,6 +508,7 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PL030=y CONFIG_RTC_DRV_PL031=y CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y CONFIG_UIO=y CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 218a659ec91b..8615745b19ed 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -459,6 +459,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_EDAC=y CONFIG_RTC_CLASS=y CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y CONFIG_UIO=y # CONFIG_VIRTIO_MEM is not set CONFIG_VHOST_VSOCK=y diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index 1c46b90fd2f4..ad58616b34df 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -1,5 +1,7 @@ -config DMABUF_HEAPS_DEFERRED_FREE - tristate +menuconfig DMABUF_HEAPS_DEFERRED_FREE + bool "DMA-BUF heaps deferred-free library" + help + Choose this option to enable the DMA-BUF heaps deferred-free library. config DMABUF_HEAPS_SYSTEM tristate "DMA-BUF System Heap"