diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 16:48:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 16:48:29 -0800 |
| commit | 0e670506668a43e1355b8f10c33d081a676bd521 (patch) | |
| tree | 236d238cc234da1e6d375b5c2864cbac836fd71f /arch/ia64/mm/discontig.c | |
| parent | 238523e1a15874b88955ff9c8f63e35597ae2857 (diff) | |
| parent | bf7ececa9b68f4720f1ce344f442435660bcdae7 (diff) | |
| download | kernel_samsung_aries-0e670506668a43e1355b8f10c33d081a676bd521.zip kernel_samsung_aries-0e670506668a43e1355b8f10c33d081a676bd521.tar.gz kernel_samsung_aries-0e670506668a43e1355b8f10c33d081a676bd521.tar.bz2 | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
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 0f776b0..c87d6d1 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 |