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

Commit ef502971 authored by Liam Mark's avatar Liam Mark Committed by Swathi Sridhar
Browse files

Revert "mm: make cma the first choice for movable request" 



This reverts commit 8915754213550ab285e0a317a89c3ecf77a4324c.
Re-introducing __GFP_CMA so revert this change.

Change-Id: I876ca94c313d55c34c1fd64453675a0d9d2f9d96
Signed-off-by: default avatarLiam Mark <lmark@codeaurora.org>
parent 2e0faba3

mm/page_alloc.c

+5 −5
Original line number Diff line number Diff line
@@ -2451,14 +2451,14 @@ __rmqueue_fallback(struct zone *zone, int order, int start_migratetype) 
static __always_inline struct page *

__rmqueue(struct zone *zone, unsigned int order, int migratetype)

{

	struct page *page = NULL;

	struct page *page;



retry:

	page = __rmqueue_smallest(zone, order, migratetype);

	if (unlikely(!page)) {

		if (migratetype == MIGRATE_MOVABLE)

			page = __rmqueue_cma_fallback(zone, order);



	if (!page) {

		page = __rmqueue_smallest(zone, order, migratetype);

		if (!page && __rmqueue_fallback(zone, order, migratetype))

			goto retry;

	}