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

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

Merge "mm/page_alloc: move freepage counting logic to __free_one_page()"

parents 58a8da8b f7fa35b8

mm/page_alloc.c

+1 −12
Original line number Diff line number Diff line
@@ -701,14 +701,8 @@ static void free_pcppages_bulk(struct zone *zone, int count, 
			/* must delete as __free_one_page list manipulates */

			list_del(&page->lru);

			mt = get_freepage_migratetype(page);

			if (unlikely(has_isolate_pageblock(zone))) {

			if (unlikely(has_isolate_pageblock(zone)))

				mt = get_pageblock_migratetype(page);

				if (is_migrate_isolate(mt))

					goto skip_counting;

			}

			__mod_zone_freepage_state(zone, 1, mt);



skip_counting:

			/* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */

			__free_one_page(page, zone, 0, mt);

			trace_mm_page_pcpu_drain(page, 0, mt);
@@ -726,12 +720,7 @@ static void free_one_page(struct zone *zone, struct page *page, int order, 
	if (unlikely(has_isolate_pageblock(zone) ||

		is_migrate_isolate(migratetype))) {

		migratetype = get_pageblock_migratetype(page);

		if (is_migrate_isolate(migratetype))

			goto skip_counting;

	}

	__mod_zone_freepage_state(zone, 1 << order, migratetype);



skip_counting:

	__free_one_page(page, zone, order, migratetype);

	spin_unlock(&zone->lock);

}