---

yaml --- r: 349704 b: refs/heads/master c: 41a7973 h: refs/heads/master v: v3
git-mirror · Feb 12, 2013 · b712ac8 · b712ac8
1 parent 4bae74f
commit b712ac8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e6668845fe593414a938b7726d6359b5570ac5a
+refs/heads/master: 41a7973447b0b8717f0a214d4328dc31ec2291d7
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -773,6 +773,10 @@ void __init init_cma_reserved_pageblock(struct page *page)
 	set_pageblock_migratetype(page, MIGRATE_CMA);
 	__free_pages(page, pageblock_order);
 	totalram_pages += pageblock_nr_pages;
+#ifdef CONFIG_HIGHMEM
+	if (PageHighMem(page))
+		totalhigh_pages += pageblock_nr_pages;
+#endif
 }
 #endif