From d6b4224d7f3dfb97b3019240cc6d337d9a8bf4f2 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@saeurebad.de>
Date: Fri, 23 May 2008 13:04:21 -0700
Subject: [PATCH] --- yaml --- r: 97239 b: refs/heads/master c:
 f7232154198f928fc25f420d6190468212a7632a h: refs/heads/master i:   97237:
 0e7d4afbf593aac162d96fb108cbfb08ba02fbe4   97235:
 3fa96b9d14f8620d7afb6eedf787c22cb99ce3f5   97231:
 b83f93a72537b33e1c9ec8a43332b57f184c5cda v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4161ffd5654..2d1c30cf08b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f899b0adc6fc8f60a9db8b52f36f06fd1abeaf7c
+refs/heads/master: f7232154198f928fc25f420d6190468212a7632a
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 63835579323a..035300299f94 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -3378,7 +3378,8 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
 		 * is used by this zone for memmap. This affects the watermark
 		 * and per-cpu initialisations
 		 */
-		memmap_pages = (size * sizeof(struct page)) >> PAGE_SHIFT;
+		memmap_pages =
+			PAGE_ALIGN(size * sizeof(struct page)) >> PAGE_SHIFT;
 		if (realsize >= memmap_pages) {
 			realsize -= memmap_pages;
 			printk(KERN_DEBUG