From 5f2d245373889c327eee9db3968dee63149b6bcb Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Mon, 27 Dec 2010 16:48:08 -0800
Subject: [PATCH] --- yaml --- r: 234814 b: refs/heads/master c:
 dbef7b56d2fc5115f26f72a0b080283bbf972cab h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/numa_64.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4054e5a668d7..ea14438c5190 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45635ab5e41bcde94a82f9a05d660ef77fe38c1b
+refs/heads/master: dbef7b56d2fc5115f26f72a0b080283bbf972cab
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index 7762a517d69d..02d36ff85ebd 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/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