1 files changed, 7 insertions, 0 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 9b8e6243a52..5485f0ef4ec 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5916,6 +5916,7 @@ static int __meminit __zone_pcp_update(void *data)
                 local_irq_save(flags);
                 if (pcp->count > 0)
                         free_pcppages_bulk(zone, pcp->count, pcp);
+                drain_zonestat(zone, pset);
                 setup_pageset(pset, batch);
                 local_irq_restore(flags);
         }
@@ -5932,10 +5933,16 @@ void __meminit zone_pcp_update(struct zone *zone)
 void zone_pcp_reset(struct zone *zone)
 {
         unsigned long flags;
+        int cpu;
+        struct per_cpu_pageset *pset;
 
         /* avoid races with drain_pages()  */
         local_irq_save(flags);
         if (zone->pageset != &boot_pageset) {
+                for_each_online_cpu(cpu) {
+                        pset = per_cpu_ptr(zone->pageset, cpu);
+                        drain_zonestat(zone, pset);
+                }
                 free_percpu(zone->pageset);
                 zone->pageset = &boot_pageset;
         }