1 files changed, 13 insertions, 15 deletions

diff --git a/mm/vmstat.c b/mm/vmstat.c
index bf62a8232100..5462106725d7 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -19,12 +19,10 @@ void __get_zone_counts(unsigned long *active, unsigned long *inactive,
         struct zone *zones = pgdat->node_zones;
         int i;
 
-        *active = 0;
-        *inactive = 0;
+        *active = node_page_state(pgdat->node_id, NR_ACTIVE);
+        *inactive = node_page_state(pgdat->node_id, NR_INACTIVE);
         *free = 0;
         for (i = 0; i < MAX_NR_ZONES; i++) {
-                *active += zones[i].nr_active;
-                *inactive += zones[i].nr_inactive;
                 *free += zones[i].free_pages;
         }
 }
@@ -34,14 +32,12 @@ void get_zone_counts(unsigned long *active,
 {
         struct pglist_data *pgdat;
 
-        *active = 0;
-        *inactive = 0;
+        *active = global_page_state(NR_ACTIVE);
+        *inactive = global_page_state(NR_INACTIVE);
         *free = 0;
         for_each_online_pgdat(pgdat) {
                 unsigned long l, m, n;
                 __get_zone_counts(&l, &m, &n, pgdat);
-                *active += l;
-                *inactive += m;
                 *free += n;
         }
 }
@@ -239,7 +235,7 @@ EXPORT_SYMBOL(mod_zone_page_state);
  * in between and therefore the atomicity vs. interrupt cannot be exploited
  * in a useful way here.
  */
-static void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
+void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
 {
         struct per_cpu_pageset *pcp = zone_pcp(zone, smp_processor_id());
         s8 *p = pcp->vm_stat_diff + item;
@@ -260,9 +256,8 @@ void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
 }
 EXPORT_SYMBOL(__inc_zone_page_state);
 
-void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
+void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
 {
-        struct zone *zone = page_zone(page);
         struct per_cpu_pageset *pcp = zone_pcp(zone, smp_processor_id());
         s8 *p = pcp->vm_stat_diff + item;
 
@@ -275,6 +270,11 @@ void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
                 *p = overstep;
         }
 }
+
+void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
+{
+        __dec_zone_state(page_zone(page), item);
+}
 EXPORT_SYMBOL(__dec_zone_page_state);
 
 void inc_zone_state(struct zone *zone, enum zone_stat_item item)
@@ -454,6 +454,8 @@ const struct seq_operations fragmentation_op = {
 
 static const char * const vmstat_text[] = {
         /* Zoned VM counters */
+        "nr_active",
+        "nr_inactive",
         "nr_anon_pages",
         "nr_mapped",
         "nr_file_pages",
@@ -529,8 +531,6 @@ static int zoneinfo_show(struct seq_file *m, void *arg)
                            "\n        min      %lu"
                            "\n        low      %lu"
                            "\n        high     %lu"
-                           "\n        active   %lu"
-                           "\n        inactive %lu"
                            "\n        scanned  %lu (a: %lu i: %lu)"
                            "\n        spanned  %lu"
                            "\n        present  %lu",
@@ -538,8 +538,6 @@ static int zoneinfo_show(struct seq_file *m, void *arg)
                            zone->pages_min,
                            zone->pages_low,
                            zone->pages_high,
-                           zone->nr_active,
-                           zone->nr_inactive,
                            zone->pages_scanned,
                            zone->nr_scan_active, zone->nr_scan_inactive,
                            zone->spanned_pages,