From 70ad75e771d15cdf21f43548ee47bb38b4c2f564 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Thu, 30 Dec 2021 16:45:24 -0800 Subject: [PATCH] ANDROID: dma-heap: Make the page-pool library built-in Since vendors might depend on them for their system heap implementations, make the page-pool library built-in to freeze its KMI. Bug: 183902174 Bug: 212210831 Change-Id: If633619ec1f78d0fbd73c43c48b19d98db7807af Signed-off-by: Hridya Valsaraju --- 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 7ce2404c8aef..1f0412fddf24 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -531,6 +531,7 @@ CONFIG_RTC_DRV_PL031=y CONFIG_DMABUF_HEAPS=y CONFIG_DMABUF_SYSFS_STATS=y CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y +CONFIG_DMABUF_HEAPS_PAGE_POOL=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 8b644d45c458..61fd094192b0 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -496,6 +496,7 @@ CONFIG_RTC_CLASS=y CONFIG_DMABUF_HEAPS=y CONFIG_DMABUF_SYSFS_STATS=y CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y +CONFIG_DMABUF_HEAPS_PAGE_POOL=y CONFIG_UIO=y CONFIG_VHOST_VSOCK=y CONFIG_STAGING=y diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index 054edea30387..c90fdb97a352 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -3,8 +3,10 @@ menuconfig DMABUF_HEAPS_DEFERRED_FREE help Choose this option to enable the DMA-BUF heaps deferred-free library. -config DMABUF_HEAPS_PAGE_POOL - tristate +menuconfig DMABUF_HEAPS_PAGE_POOL + bool "DMA-BUF heaps page-pool library" + help + Choose this option to enable the DMA-BUF heaps page-pool library. config DMABUF_HEAPS_SYSTEM tristate "DMA-BUF System Heap"