2 files changed, 5 insertions, 4 deletions

diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index c024606221c4..fc53ad068128 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -591,7 +591,7 @@ static unsigned int count_free_highmem_pages(void)
 
         for_each_zone(zone)
                 if (populated_zone(zone) && is_highmem(zone))
-                        cnt += zone->free_pages;
+                        cnt += zone_page_state(zone, NR_FREE_PAGES);
 
         return cnt;
 }
@@ -869,7 +869,7 @@ static int enough_free_mem(unsigned int nr_pages, unsigned int nr_highmem)
         for_each_zone(zone) {
                 meta += snapshot_additional_pages(zone);
                 if (!is_highmem(zone))
-                        free += zone->free_pages;
+                        free += zone_page_state(zone, NR_FREE_PAGES);
         }
 
         nr_pages += count_pages_for_highmem(nr_highmem);
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 31aa0390c777..7fb834397a0d 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -230,9 +230,10 @@ int swsusp_shrink_memory(void)
                 for_each_zone (zone)
                         if (populated_zone(zone)) {
                                 if (is_highmem(zone)) {
-                                        highmem_size -= zone->free_pages;
+                                        highmem_size -=
+                                        zone_page_state(zone, NR_FREE_PAGES);
                                 } else {
-                                        tmp -= zone->free_pages;
+                                        tmp -= zone_page_state(zone, NR_FREE_PAGES);
                                         tmp += zone->lowmem_reserve[ZONE_NORMAL];
                                         tmp += snapshot_additional_pages(zone);
                                 }