x86-32, numa: Align pgdat size while initializing alloc_remap

When pgdat is reserved in init_remap_allocator(), PAGE_SIZE aligned
size will be used.  Match the size alignment in initialization to
avoid allocation failure down the road.

Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1301955840-7246-3-git-send-email-tj@kernel.org
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index 84aac47c38870efd11799c5eea46330909c8de53..50e82507eab4cd5bd7afc8f6466f6766e7e0ca70 100644 (file)
--- a/arch/x86/mm/numa_32.c
+++ b/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;