From d76759801f2a6c6d35924b82f9eb4b910442fadf Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 29 Nov 2012 14:17:29 +1100 Subject: [PATCH] mm: cma: skip watermarks check for already isolated blocks in split_free_page() fix Cleanup and simplify the code which uses page migrate type. Signed-off-by: Marek Szyprowski Cc: Kyungmin Park Cc: Arnd Bergmann Cc: Mel Gorman Cc: Michal Nazarewicz Cc: Minchan Kim Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton --- mm/page_alloc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 54a2224649db..61280ff40439 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1393,12 +1393,15 @@ int capture_free_page(struct page *page, int alloc_order, int migratetype) zone = page_zone(page); order = page_order(page); + mt = get_pageblock_migratetype(page); - if (get_pageblock_migratetype(page) != MIGRATE_ISOLATE) { + if (mt != MIGRATE_ISOLATE) { /* 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)) return 0; + + __mod_zone_freepage_state(zone, -(1UL << order), mt); } /* Remove page from free list */ @@ -1406,10 +1409,6 @@ int capture_free_page(struct page *page, int alloc_order, int migratetype) zone->free_area[order].nr_free--; rmv_page_order(page); - mt = get_pageblock_migratetype(page); - if (unlikely(mt != MIGRATE_ISOLATE)) - __mod_zone_freepage_state(zone, -(1UL << alloc_order), mt); - if (alloc_order != order) expand(zone, page, alloc_order, order, &zone->free_area[order], migratetype); -- 2.39.5