diff options
author | holt@sgi.com <holt@sgi.com> | 2008-04-03 22:17:12 +0200 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-04-08 22:50:58 +0200 |
commit | 41bd26d67c41e325c6b9e56aadfe9dad8af9a565 (patch) | |
tree | d2a2c7dc8b570dd049e33412935ca26ea54a0d7f /arch | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
download | linux-41bd26d67c41e325c6b9e56aadfe9dad8af9a565.tar.xz linux-41bd26d67c41e325c6b9e56aadfe9dad8af9a565.zip |
[IA64] Correct pernodesize calculation.
A simple fix. The existing pernodesize reservation is not taking into
account a second array of pg_data_t structures. This is normally not
important because the PAGE_ALIGN macro reserves adequate space.
I made the compute_pernodesize steps in the same order as the fill_pernode
steps to make the correlation more clear.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/mm/discontig.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index ee5e68b2af94..06c540a29467 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c @@ -124,6 +124,7 @@ static unsigned long __meminit compute_pernodesize(int node) pernodesize += node * L1_CACHE_BYTES; pernodesize += L1_CACHE_ALIGN(sizeof(pg_data_t)); pernodesize += L1_CACHE_ALIGN(sizeof(struct ia64_node_data)); + pernodesize += L1_CACHE_ALIGN(sizeof(pg_data_t)); pernodesize = PAGE_ALIGN(pernodesize); return pernodesize; } |