From f2280ab7ee45407fd648b603d1ee942ed12d3084 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Fri, 8 Sep 2017 13:56:26 +0200 Subject: [PATCH] staging/ion: CONFIG_ION_UNMAPPED_HEAP conditions unmapped heap Condition ION unmapped heap implementation to architectures that currently support it. ARM is one of these. Signed-off-by: Etienne Carriere Reviewed-by: Joakim Bech (cherry picked from commit 7c7d9c446252829aa138c87c47a937e2a3b4fd26 linaro repo https://github.com/linaro-swg/linux.git tag optee-v4.9-20171005) --- drivers/staging/android/ion/Kconfig | 12 +++++++++++- drivers/staging/android/ion/Makefile | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig index 821871ddf678..36657442c287 100644 --- a/drivers/staging/android/ion/Kconfig +++ b/drivers/staging/android/ion/Kconfig @@ -60,9 +60,19 @@ config ION_OF If using Ion and devicetree, you should say Y here +config ION_UNMAPPED_HEAP + bool "unmapped heap support in ION" + depends on ION && ARM + default y + help + ION unmapped heap is not available on some architectures. + If unmapped heap is supported, the default configuration enables + it. You should say N here only if you really do not want unmapped + heap support in the ION driver. + config ION_DUMMY_UNMAPPED_HEAP bool "ION dummy driver define an ION unmapped heap" - depends on ION_DUMMY + depends on ION_DUMMY && ION_UNMAPPED_HEAP help Dummy ION driver will create a unmapped heap from physical location provided through CONFIG_ION_DUMMY_UNMAPPED_BASE and diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile index 7faf2914e8d1..6653353e86d8 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile @@ -1,7 +1,8 @@ obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o \ ion_page_pool.o ion_system_heap.o \ ion_carveout_heap.o ion_chunk_heap.o ion_cma_heap.o -obj-$(CONFIG_ION) += ion_unmapped_heap.o + +obj-$(CONFIG_ION_UNMAPPED_HEAP) += ion_unmapped_heap.o obj-$(CONFIG_ION_TEST) += ion_test.o ifdef CONFIG_COMPAT -- 2.17.1