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

Commit dd36f71a authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: fix cma accounting in zone_watermark_ok"

parents 6148ddd3 88b42c30

mm/page_alloc.c

+8 −0
Original line number Diff line number Diff line
@@ -3080,6 +3080,14 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, 
			continue;



		for (mt = 0; mt < MIGRATE_PCPTYPES; mt++) {

#ifdef CONFIG_CMA

			/*

			 * Note that this check is needed only

			 * when MIGRATE_CMA < MIGRATE_PCPTYPES.

			 */

			if (mt == MIGRATE_CMA)

				continue;

#endif

			if (!list_empty(&area->free_list[mt]))

				return true;

		}