From 9cd257e8b34553773a6b4774699e4c4277709796 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 5 Apr 2011 00:23:48 +0200 Subject: [PATCH] --- yaml --- r: 245679 b: refs/heads/master c: a6c24f7a705d939ddd2fcaa443fa3d8e852b933d h: refs/heads/master i: 245677: 3e43caf8a7ba2d00da1b7ede2cc4d5ca6d14fbf7 245675: 87a2878d82c01d187250c79ad4d83aad1891de4c 245671: e5a639f0e68dcd34ae81d948d2f280fd2bfd206f 245663: 7058de51f0063879c5a5bc89f01c4389e182f11f v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/numa_32.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 429aeef59d8e..4674d2c05e86 100644 --- 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 index 84aac47c3887..50e82507eab4 100644 --- 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;