---

yaml --- r: 245679 b: refs/heads/master c: a6c24f7 h: refs/heads/master i: 245677: 3e43caf 245675: 87a2878 245671: e5a639f 245663: 7058de5 v: v3
git-mirror · Apr 7, 2011 · 9cd257e · 9cd257e
1 parent 88119a0
commit 9cd257e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fe14ab541cd9b0d1f243afb7556046f12c8743c
+refs/heads/master: a6c24f7a705d939ddd2fcaa443fa3d8e852b933d
diff --git a/trunk/arch/x86/mm/numa_32.c b/trunk/arch/x86/mm/numa_32.c
@@ -287,7 +287,8 @@ static __init unsigned long calculate_numa_remap_pages(void)
 			node_end_pfn[nid] = max_pfn;
 
 		/* ensure the remap includes space for the pgdat. */
-		size = node_remap_size[nid] + sizeof(pg_data_t);
+		size = node_remap_size[nid];
+		size += ALIGN(sizeof(pg_data_t), PAGE_SIZE);
 
 		/* convert size to large (pmd size) pages, rounding up */
 		size = (size + LARGE_PAGE_BYTES - 1) / LARGE_PAGE_BYTES;