1 files changed, 8 insertions, 5 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index df1da25b309b..58923bea0d8b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -715,14 +715,17 @@ 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))) {
+                                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, page_to_pfn(page), zone, 0, mt);
                         trace_mm_page_pcpu_drain(page, 0, mt);
-                        if (likely(!is_migrate_isolate_page(page))) {
-                                __mod_zone_page_state(zone, NR_FREE_PAGES, 1);
-                                if (is_migrate_cma(mt))
-                                        __mod_zone_page_state(zone, NR_FREE_CMA_PAGES, 1);
-                        }
                 } while (--to_free && --batch_free && !list_empty(list));
         }
         spin_unlock(&zone->lock);