X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=mm%2Fhighmem.c;h=7a967bc351526d8f745fb2f3a9655a5151ed783f;hb=4c5cdb1e1f2a502069f57a60b5c6b97b8106c73c;hp=be8f8d36a8b9b6919f4d1c36e1b3b3e973b242f1;hpb=972d45fb43f0f0793fa275c4a22998106760cd61;p=cascardo%2Flinux.git

diff --git a/mm/highmem.c b/mm/highmem.c
index be8f8d36a8b9..7a967bc35152 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;
 }