From 5b0125025ba2a2dbba0400dc9614b61f53291af3 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Fri, 9 Nov 2012 14:04:01 +1100 Subject: [PATCH] memory-hotplug: fix NR_FREE_PAGES mismatch's fix When a page is freed and put into pcp list, get_freepage_migratetype() doesn't return MIGRATE_ISOLATE even if this pageblock is isolated. So we should use get_freepage_migratetype() instead of mt to check whether it is isolated. Signed-off-by: Wen Congyang Reported-by: Jianguo Wu Signed-off-by: Andrew Morton --- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ad7d670b662f..fb1f9311f1fd 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -666,7 +666,7 @@ static void free_pcppages_bulk(struct zone *zone, int count, /* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */ __free_one_page(page, zone, 0, mt); trace_mm_page_pcpu_drain(page, 0, mt); - if (likely(mt != MIGRATE_ISOLATE)) { + if (likely(get_pageblock_migratetype(page) != MIGRATE_ISOLATE)) { __mod_zone_page_state(zone, NR_FREE_PAGES, 1); if (is_migrate_cma(mt)) __mod_zone_page_state(zone, NR_FREE_CMA_PAGES, 1); -- 2.39.5