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

Commit 4102329e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: Check for PagePrivate in free_buffer_page"

parents 0d9fc8f0 0f9dbcc5

drivers/staging/android/ion/heaps/ion_msm_system_heap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -143,7 +143,7 @@ void free_buffer_page(struct ion_msm_system_heap *heap, 
	if (!(buffer->flags & ION_FLAG_POOL_FORCE_ALLOC)) {

	if (!(buffer->flags & ION_FLAG_POOL_FORCE_ALLOC)) {

		struct ion_msm_page_pool *pool;

		struct ion_msm_page_pool *pool;





		if (vmid > 0)

		if (vmid > 0 && PagePrivate(page))

			pool = heap->secure_pools[vmid][order_to_index(order)];

			pool = heap->secure_pools[vmid][order_to_index(order)];

		else if (cached)

		else if (cached)

			pool = heap->cached_pools[order_to_index(order)];

			pool = heap->cached_pools[order_to_index(order)];