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

Commit 1d5b0b39 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: don't steal highatomic pageblock" into msm-4.9

parents 98d54d0d 38c28bff

mm/page_alloc.c

+4 −2
Original line number Diff line number Diff line
@@ -2133,7 +2133,8 @@ __rmqueue_fallback(struct zone *zone, unsigned int order, int start_migratetype) 


		page = list_first_entry(&area->free_list[fallback_mt],

						struct page, lru);

		if (can_steal)

		if (can_steal &&

			get_pageblock_migratetype(page) != MIGRATE_HIGHATOMIC)

			steal_suitable_fallback(zone, page, start_migratetype);



		/* Remove the page from the freelists */
@@ -2542,7 +2543,8 @@ int __isolate_free_page(struct page *page, unsigned int order) 
		struct page *endpage = page + (1 << order) - 1;

		for (; page < endpage; page += pageblock_nr_pages) {

			int mt = get_pageblock_migratetype(page);

			if (!is_migrate_isolate(mt) && !is_migrate_cma(mt))

			if (!is_migrate_isolate(mt) && !is_migrate_cma(mt)

				&& mt != MIGRATE_HIGHATOMIC)

				set_pageblock_migratetype(page,

							  MIGRATE_MOVABLE);

		}