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

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

Merge "ion_page_pool: Remove GFP_COMP from page allocation mask"

parents 771d0f81 c939cf82

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);

drivers/staging/android/uapi/msm_ion.h

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ struct ion_prefetch_regions { 
struct ion_prefetch_data {

	int heap_id;

	unsigned long len;

	/* Is unsigned long bad? 32bit compiler vs 64 bit compiler*/

	struct ion_prefetch_regions __user *regions;

	unsigned int nr_regions;

};