From b712ac807f0fc0a865e456ae6de0dfb875babc6b Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Tue, 12 Feb 2013 13:46:24 -0800
Subject: [PATCH] --- yaml --- r: 349704 b: refs/heads/master c:
 41a7973447b0b8717f0a214d4328dc31ec2291d7 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1e9910b71e63..b930db70858e 100644
--- 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
index df2022ff0c8a..9673d96b1ba7 100644
--- 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