1 files changed, 14 insertions, 1 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index b54c5cbf0200..5a234b64f3ac 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4187,10 +4187,23 @@ int __meminit __early_pfn_to_nid(unsigned long pfn)
 {
         unsigned long start_pfn, end_pfn;
         int i, nid;
+        /*
+         * NOTE: The following SMP-unsafe globals are only used early in boot
+         * when the kernel is running single-threaded.
+         */
+        static unsigned long __meminitdata last_start_pfn, last_end_pfn;
+        static int __meminitdata last_nid;
+
+        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)
+                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;
 }