1 files changed, 3 insertions, 11 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 58923bea0d8b..9f689f16b5aa 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -577,6 +577,8 @@ static inline void __free_one_page(struct page *page,
                         return;
 
         VM_BUG_ON(migratetype == -1);
+        if (!is_migrate_isolate(migratetype))
+                __mod_zone_freepage_state(zone, 1 << order, migratetype);
 
         page_idx = pfn & ((1 << MAX_ORDER) - 1);
 
@@ -715,14 +717,9 @@ 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, page_to_pfn(page), zone, 0, mt);
                         trace_mm_page_pcpu_drain(page, 0, mt);
@@ -745,12 +742,7 @@ static void free_one_page(struct zone *zone,
         if (unlikely(has_isolate_pageblock(zone) ||
                 is_migrate_isolate(migratetype))) {
                 migratetype = get_pfnblock_migratetype(page, pfn);
-                if (is_migrate_isolate(migratetype))
-                        goto skip_counting;
         }
-        __mod_zone_freepage_state(zone, 1 << order, migratetype);
-
-skip_counting:
         __free_one_page(page, pfn, zone, order, migratetype);
         spin_unlock(&zone->lock);
 }