From 516182494413a52b66127df19afd6486ff56fdd5 Mon Sep 17 00:00:00 2001 From: Jack Steiner Date: Mon, 5 Dec 2005 13:56:50 -0600 Subject: [PATCH] --- yaml --- r: 15079 b: refs/heads/master c: acb7f67280128a9ddaa756ff10212391d28caec4 h: refs/heads/master i: 15077: 24ebe0a002419638ea925400e6635a2ae0ded064 15075: e01d96b48d38682947f8da1ad79ff2e50b4463a3 15071: 5946427ca9f2e8885995562d0f604b739be8376b v: v3 --- [refs] | 2 +- trunk/arch/ia64/mm/discontig.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8d52c16dd713..0fc5f661ebcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ec829b6895092b0686254c315f42642b4a07efc +refs/heads/master: acb7f67280128a9ddaa756ff10212391d28caec4 diff --git a/trunk/arch/ia64/mm/discontig.c b/trunk/arch/ia64/mm/discontig.c index 0f776b032d31..c87d6d1d5813 100644 --- a/trunk/arch/ia64/mm/discontig.c +++ b/trunk/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