2 files changed, 28 insertions, 2 deletions

diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index def782e31aac..4248492b9321 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -61,13 +61,26 @@ paddr_to_nid(unsigned long paddr)
 int __meminit __early_pfn_to_nid(unsigned long pfn)
 {
         int i, section = pfn >> PFN_SECTION_SHIFT, ssec, esec;
+        /*
+         * NOTE: The following SMP-unsafe globals are only used early in boot
+         * when the kernel is running single-threaded.
+         */
+        static int __meminitdata last_ssec, last_esec;
+        static int __meminitdata last_nid;
+
+        if (section >= last_ssec && section < last_esec)
+                return last_nid;
 
         for (i = 0; i < num_node_memblks; i++) {
                 ssec = node_memblk[i].start_paddr >> PA_SECTION_SHIFT;
                 esec = (node_memblk[i].start_paddr + node_memblk[i].size +
                         ((1L << PA_SECTION_SHIFT) - 1)) >> PA_SECTION_SHIFT;
-                if (section >= ssec && section < esec)
+                if (section >= ssec && section < esec) {
+                        last_ssec = ssec;
+                        last_esec = esec;
+                        last_nid = node_memblk[i].nid;
                         return node_memblk[i].nid;
+                }
         }
 
         return -1;
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;
 }