X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fhighmem.c;fp=mm%2Fhighmem.c;h=7a967bc351526d8f745fb2f3a9655a5151ed783f;hb=2a1e274acf0b1c192face19a4be7c12d4503eaaf;hp=be8f8d36a8b9b6919f4d1c36e1b3b3e973b242f1;hpb=769848c03895b63e5662eb7e4ec8c4866f7d0183;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/highmem.c b/mm/highmem.c
index be8f8d3..7a967bc 100644
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -46,9 +46,14 @@ unsigned int nr_free_highpages (void)
 	pg_data_t *pgdat;
 	unsigned int pages = 0;
 
-	for_each_online_pgdat(pgdat)
+	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);
+	}
 
 	return pages;
 }