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

Commit 193121a0 authored by Liam Mark's avatar Liam Mark Committed by Matt Wagantall
Browse files

mm: split_free_page ignore memory watermarks for CMA 



Memory watermarks were sometimes preventing CMA allocations
in low memory.

Change-Id: I550ec987cbd6bc6dadd72b4a764df20cd0758479
Signed-off-by: default avatarLiam Mark <lmark@codeaurora.org>
parent 97c6eee6

mm/page_alloc.c

+2 −1
Original line number Diff line number Diff line
@@ -1551,7 +1551,8 @@ int __isolate_free_page(struct page *page, unsigned int order) 
	if (!is_migrate_isolate(mt)) {

		/* Obey watermarks as if the page was being allocated */

		watermark = low_wmark_pages(zone) + (1 << order);

		if (!zone_watermark_ok(zone, 0, watermark, 0, 0))

		if (!is_migrate_cma(mt) &&

		    !zone_watermark_ok(zone, 0, watermark, 0, 0))

			return 0;



		__mod_zone_freepage_state(zone, -(1UL << order), mt);