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

Commit c939cf82 authored by Patrick Daly's avatar Patrick Daly
Browse files

ion_page_pool: Remove GFP_COMP from page allocation mask 



Using GFP_COMP to create compound pages prevents split_pages from being
used to split an order > 0 page into order 0 pages.

Required for future changes to the system_heap allocation algorithm.

Change-Id: I5ab82f717bb003e074124e1ffae3f112c405bc2b
Signed-off-by: default avatarPatrick Daly <pdaly@codeaurora.org>
parent 77b806f7

drivers/staging/android/ion/ion_page_pool.c

+1 −3
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ void ion_page_pool_free(struct ion_page_pool *pool, struct page *page) 
{

	int ret;



	BUG_ON(pool->order != compound_order(page));



	ret = ion_page_pool_add(pool, page);

	if (ret)

		ion_page_pool_free_pages(pool, page);
@@ -200,7 +198,7 @@ struct ion_page_pool *ion_page_pool_create(struct device *dev, gfp_t gfp_mask, 
	pool->low_count = 0;

	INIT_LIST_HEAD(&pool->low_items);

	INIT_LIST_HEAD(&pool->high_items);

	pool->gfp_mask = gfp_mask | __GFP_COMP;

	pool->gfp_mask = gfp_mask;

	pool->order = order;

	mutex_init(&pool->mutex);

	plist_node_init(&pool->list, order);