1 files changed, 3 insertions, 10 deletions

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 91149746bb8d..9826766f1274 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -27,7 +27,7 @@ static void sum_vm_events(unsigned long *ret, const struct cpumask *cpumask)
 
         memset(ret, 0, NR_VM_EVENT_ITEMS * sizeof(unsigned long));
 
-        for_each_cpu_mask_nr(cpu, *cpumask) {
+        for_each_cpu(cpu, cpumask) {
                 struct vm_event_state *this = &per_cpu(vm_event_states, cpu);
 
                 for (i = 0; i < NR_VM_EVENT_ITEMS; i++)
@@ -135,11 +135,7 @@ static void refresh_zone_stat_thresholds(void)
         int cpu;
         int threshold;
 
-        for_each_zone(zone) {
-
-                if (!zone->present_pages)
-                        continue;
-
+        for_each_populated_zone(zone) {
                 threshold = calculate_threshold(zone);
 
                 for_each_online_cpu(cpu)
@@ -301,12 +297,9 @@ void refresh_cpu_vm_stats(int cpu)
         int i;
         int global_diff[NR_VM_ZONE_STAT_ITEMS] = { 0, };
 
-        for_each_zone(zone) {
+        for_each_populated_zone(zone) {
                 struct per_cpu_pageset *p;
 
-                if (!populated_zone(zone))
-                        continue;
-
                 p = zone_pcp(zone, cpu);
 
                 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)