3 files changed, 29 insertions, 10 deletions

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index f388203db7e8..31e95acddb4d 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -60,6 +60,8 @@ int memblock_reserve(phys_addr_t base, phys_addr_t size);
 void memblock_trim_memory(phys_addr_t align);
 
 #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
+int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn,
+                            unsigned long  *end_pfn);
 void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
                           unsigned long *out_end_pfn, int *out_nid);
 
diff --git a/mm/memblock.c b/mm/memblock.c
index a847bfe6f3ba..0ac412a0a7ee 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -914,6 +914,24 @@ int __init_memblock memblock_is_memory(phys_addr_t addr)
         return memblock_search(&memblock.memory, addr) != -1;
 }
 
+#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
+int __init_memblock memblock_search_pfn_nid(unsigned long pfn,
+                         unsigned long *start_pfn, unsigned long *end_pfn)
+{
+        struct memblock_type *type = &memblock.memory;
+        int mid = memblock_search(type, (phys_addr_t)pfn << PAGE_SHIFT);
+
+        if (mid == -1)
+                return -1;
+
+        *start_pfn = type->regions[mid].base >> PAGE_SHIFT;
+        *end_pfn = (type->regions[mid].base + type->regions[mid].size)
+                        >> PAGE_SHIFT;
+
+        return type->regions[mid].nid;
+}
+#endif
+
 /**
  * memblock_is_region_memory - check if a region is a subset of memory
  * @base: base of region to check
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f7cc08dad26a..22653e34a047 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4306,7 +4306,7 @@ int __meminit init_currently_empty_zone(struct zone *zone,
 int __meminit __early_pfn_to_nid(unsigned long pfn)
 {
         unsigned long start_pfn, end_pfn;
-        int i, nid;
+        int nid;
         /*
          * NOTE: The following SMP-unsafe globals are only used early in boot
          * when the kernel is running single-threaded.
@@ -4317,15 +4317,14 @@ int __meminit __early_pfn_to_nid(unsigned long pfn)
         if (last_start_pfn <= pfn && pfn < last_end_pfn)
                 return last_nid;
 
-        for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid)
-                if (start_pfn <= pfn && pfn < end_pfn) {
-                        last_start_pfn = start_pfn;
-                        last_end_pfn = end_pfn;
-                        last_nid = nid;
-                        return nid;
-                }
-        /* This is a memory hole */
-        return -1;
+        nid = memblock_search_pfn_nid(pfn, &start_pfn, &end_pfn);
+        if (nid != -1) {
+                last_start_pfn = start_pfn;
+                last_end_pfn = end_pfn;
+                last_nid = nid;
+        }
+
+        return nid;
 }
 #endif /* CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID */