Merge "mm: fix compile time error with !CONFIG_CMA" (59e99cff) · Commits · e / devices / android_kernel_xiaomi_markw

mm/page_alloc.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1228,6 +1228,7 @@ retry_reserve:
		return page;
		}

		#ifdef CONFIG_CMA
		static struct page __rmqueue_cma(struct zone zone, unsigned int order)
		{
		struct page *page = 0;
		@@ -1236,6 +1237,12 @@ static struct page __rmqueue_cma(struct zone zone, unsigned int order)
		page = __rmqueue_smallest(zone, order, MIGRATE_CMA);
		return page;
		}
		#else
		static inline struct page __rmqueue_cma(struct zone zone, unsigned int order)
		{
		return NULL;
		}
		#endif

		/*
		* Obtain a specified number of elements from the buddy allocator, all under