1 files changed, 9 insertions, 9 deletions

diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index a92c91451559..78c35047586d 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -51,6 +51,7 @@
 #include <linux/highmem.h>
 #include <linux/time.h>
 #include <linux/rbtree.h>
+#include <linux/io.h>
 
 #include "power.h"
 
@@ -229,17 +230,16 @@ int swsusp_shrink_memory(void)
                 size = count_data_pages() + PAGES_FOR_IO + SPARE_PAGES;
                 tmp = size;
                 size += highmem_size;
-                for_each_zone (zone)
-                        if (populated_zone(zone)) {
-                                tmp += snapshot_additional_pages(zone);
-                                if (is_highmem(zone)) {
-                                        highmem_size -=
+                for_each_populated_zone(zone) {
+                        tmp += snapshot_additional_pages(zone);
+                        if (is_highmem(zone)) {
+                                highmem_size -=
                                         zone_page_state(zone, NR_FREE_PAGES);
-                                } else {
-                                        tmp -= zone_page_state(zone, NR_FREE_PAGES);
-                                        tmp += zone->lowmem_reserve[ZONE_NORMAL];
-                                }
+                        } else {
+                                tmp -= zone_page_state(zone, NR_FREE_PAGES);
+                                tmp += zone->lowmem_reserve[ZONE_NORMAL];
                         }
+                }
 
                 if (highmem_size < 0)
                         highmem_size = 0;