diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
commit | 783e3385a134305d49d7b431df6e591265e7ec14 (patch) | |
tree | 7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b /arch/ia64/mm/discontig.c | |
parent | fd803241744ad6e4262b6588c6af89e8fb794098 (diff) | |
parent | 1cf9e8a7865c0ac216034e519cf6b8505055ea50 (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/ia64/mm/discontig.c')
-rw-r--r-- | arch/ia64/mm/discontig.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 0f776b032d3..c87d6d1d581 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c @@ -50,8 +50,10 @@ static nodemask_t memory_less_mask __initdata; * To prevent cache aliasing effects, align per-node structures so that they * start at addresses that are strided by node number. */ +#define MAX_NODE_ALIGN_OFFSET (32 * 1024 * 1024) #define NODEDATA_ALIGN(addr, node) \ - ((((addr) + 1024*1024-1) & ~(1024*1024-1)) + (node)*PERCPU_PAGE_SIZE) + ((((addr) + 1024*1024-1) & ~(1024*1024-1)) + \ + (((node)*PERCPU_PAGE_SIZE) & (MAX_NODE_ALIGN_OFFSET - 1))) /** * build_node_maps - callback to setup bootmem structs for each node |