---

yaml
---
r: 15079
b: refs/heads/master
c: acb7f67
h: refs/heads/master
i:
  15077: 24ebe0a
  15075: e01d96b
  15071: 5946427
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ec829b6895092b0686254c315f42642b4a07efc
+refs/heads/master: acb7f67280128a9ddaa756ff10212391d28caec4

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