Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6173ece8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: fix compile time error with !CONFIG_CMA"

parents 82f1c5e0 17396ddc

drivers/staging/android/ion/ion_priv.h

+8 −0
Original line number Diff line number Diff line
@@ -366,8 +366,16 @@ void ion_carveout_heap_destroy(struct ion_heap *); 


struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *);

void ion_chunk_heap_destroy(struct ion_heap *);

#ifdef CONFIG_CMA

struct ion_heap *ion_cma_heap_create(struct ion_platform_heap *);

void ion_cma_heap_destroy(struct ion_heap *);

#else

static inline struct ion_heap *ion_cma_heap_create(struct ion_platform_heap *h)

{

	return NULL;

}

static inline void ion_cma_heap_destroy(struct ion_heap *h) {}

#endif



/**

 * kernel api to allocate/free from carveout -- used when carveout is