staging/ion: fix unmapped heap conditional support

Fixes: 7c7d9c446252 "staging/ion: CONFIG_ION_UNMAPPED_HEAP conditions unmapped heap"

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Joakim Bech <joakim.bech@linaro.org>
(cherry picked from commit bf829aa7c001c085a47c715e04cb3c347b1a38f8
 linaro repo https://github.com/linaro-swg/linux.git
 tag optee-v4.9-20171005)

diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
index ee093ab..ff12f48 100644 (file)
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -335,9 +335,11 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data)
        case ION_HEAP_TYPE_DMA:
                heap = ion_cma_heap_create(heap_data);
                break;
+#ifdef CONFIG_ION_UNMAPPED_HEAP
        case ION_HEAP_TYPE_UNMAPPED:
                heap = ion_unmapped_heap_create(heap_data);
                break;
+#endif
        default:
                pr_err("%s: Invalid heap type %d\n", __func__,
                       heap_data->type);
@@ -378,9 +380,11 @@ void ion_heap_destroy(struct ion_heap *heap)
        case ION_HEAP_TYPE_DMA:
                ion_cma_heap_destroy(heap);
                break;
+#ifdef CONFIG_ION_UNMAPPED_HEAP
        case ION_HEAP_TYPE_UNMAPPED:
                ion_unmapped_heap_destroy(heap);
                break;
+#endif
        default:
                pr_err("%s: Invalid heap type %d\n", __func__,
                       heap->type);

diff --git a/drivers/staging/android/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h
index 7979cd7..c04ea26 100644 (file)
--- a/drivers/staging/android/ion/ion_priv.h
+++ b/drivers/staging/android/ion/ion_priv.h
@@ -388,8 +388,10 @@ void ion_chunk_heap_destroy(struct ion_heap *);
 struct ion_heap *ion_cma_heap_create(struct ion_platform_heap *);
 void ion_cma_heap_destroy(struct ion_heap *);
 
+#ifdef CONFIG_ION_UNMAPPED_HEAP
 struct ion_heap *ion_unmapped_heap_create(struct ion_platform_heap *pheap);
 void ion_unmapped_heap_destroy(struct ion_heap *heap);
+#endif
 
 /**
  * functions for creating and destroying a heap pool -- allows you