diff options
author | Yinghai Lu <[email protected]> | 2010-12-27 16:48:08 -0800 |
---|---|---|
committer | H. Peter Anvin <[email protected]> | 2010-12-29 15:48:08 -0800 |
commit | dbef7b56d2fc5115f26f72a0b080283bbf972cab (patch) | |
tree | 996af99f718d77621793846c4ca7bf3973d46977 | |
parent | 45635ab5e41bcde94a82f9a05d660ef77fe38c1b (diff) |
x86-64, numa: Allocate memnodemap under max_pfn_mapped
We need to access it right way, so make sure that it is mapped already.
Prepare to put page table on local node, and nodemap is used before that.
Signed-off-by: Yinghai Lu <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
-rw-r--r-- | arch/x86/mm/numa_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 7762a517d69d..02d36ff85ebd 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -87,7 +87,7 @@ static int __init allocate_cachealigned_memnodemap(void) addr = 0x8000; nodemap_size = roundup(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES); - nodemap_addr = memblock_find_in_range(addr, max_pfn<<PAGE_SHIFT, + nodemap_addr = memblock_find_in_range(addr, get_max_mapped(), nodemap_size, L1_CACHE_BYTES); if (nodemap_addr == MEMBLOCK_ERROR) { printk(KERN_ERR |