X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=mm%2Fhighmem.c;h=50b4ca6787f08e75037c81c853bfb5d22b1cbd36;hb=857953d72f3744f325de93320cc2673795e9ca89;hp=123bcd3ed4f209ba3710d9bfcaf8725d0a105534;hpb=d0cd84817c745655428dbfdb1e3f754230b46bef;p=deliverable%2Flinux.git

diff --git a/mm/highmem.c b/mm/highmem.c
index 123bcd3ed4f2..50b4ca6787f0 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -112,16 +112,12 @@ EXPORT_PER_CPU_SYMBOL(__kmap_atomic_idx);
 
 unsigned int nr_free_highpages (void)
 {
-	pg_data_t *pgdat;
+	struct zone *zone;
 	unsigned int pages = 0;
 
-	for_each_online_pgdat(pgdat) {
-		pages += zone_page_state(&pgdat->node_zones[ZONE_HIGHMEM],
-			NR_FREE_PAGES);
-		if (zone_movable_is_highmem())
-			pages += zone_page_state(
-					&pgdat->node_zones[ZONE_MOVABLE],
-					NR_FREE_PAGES);
+	for_each_populated_zone(zone) {
+		if (is_highmem(zone))
+			pages += zone_page_state(zone, NR_FREE_PAGES);
 	}
 
 	return pages;