Merge "Revert "mm: make cma the first choice for movable request"" (2f1aed3d) · Commits · e / devices / android_kernel_oneplus_sm8150

mm/page_alloc.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -2317,14 +2317,14 @@ __rmqueue_fallback(struct zone *zone, int order, int start_migratetype)
		static 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;
		}