]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] Correct pernodesize calculation.
authorholt@sgi.com <holt@sgi.com>
Thu, 3 Apr 2008 20:17:12 +0000 (15:17 -0500)
committerTony Luck <tony.luck@intel.com>
Tue, 8 Apr 2008 20:50:58 +0000 (13:50 -0700)
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>
arch/ia64/mm/discontig.c

index ee5e68b2af949db34eda7077c43409f35abf2a19..06c540a29467064a4103806b5b33d07531c6acce 100644 (file)
@@ -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;
 }