From c939cf82c68765996689333936bedf41d2c34d2f Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Mon, 18 Apr 2016 19:50:59 -0700 Subject: [PATCH] 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: Patrick Daly --- drivers/staging/android/ion/ion_page_pool.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c index d4891e2b67f3..513d015a5ace 100644 --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/ion_page_pool.c @@ -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);