Index: sys/vm/vm_phys.c
===================================================================
--- sys/vm/vm_phys.c
+++ sys/vm/vm_phys.c
@@ -888,6 +888,16 @@
 	return (NULL);
 }
 
+/*
+ * Return the vm_page corresponding to the given physical address,
+ * in the given segment.
+ */
+static inline vm_page_t
+vm_phys_paddr_seg_page(vm_paddr_t pa, struct vm_phys_seg *seg)
+{
+	return (&seg->first_page[atop(pa - seg->start)]);
+}
+
 /*
  * Find the vm_page corresponding to the given physical address.
  */
@@ -900,7 +910,7 @@
 	for (segind = 0; segind < vm_phys_nsegs; segind++) {
 		seg = &vm_phys_segs[segind];
 		if (pa >= seg->start && pa < seg->end)
-			return (&seg->first_page[atop(pa - seg->start)]);
+			return (vm_phys_paddr_seg_page(pa, seg));
 	}
 	return (NULL);
 }
@@ -1117,7 +1127,7 @@
 			pa ^= ((vm_paddr_t)1 << (PAGE_SHIFT + order));
 			if (pa < seg->start || pa >= seg->end)
 				break;
-			m_buddy = &seg->first_page[atop(pa - seg->start)];
+			m_buddy = vm_phys_paddr_seg_page(pa, seg);
 			if (m_buddy->order != order)
 				break;
 			fl = (*seg->free_queues)[m_buddy->pool];
@@ -1126,7 +1136,7 @@
 				vm_phys_set_pool(m->pool, m_buddy, order);
 			order++;
 			pa &= ~(((vm_paddr_t)1 << (PAGE_SHIFT + order)) - 1);
-			m = &seg->first_page[atop(pa - seg->start)];
+			m = vm_phys_paddr_seg_page(pa, seg);
 		} while (order < VM_NFREEORDER - 1);
 	}
 	fl = (*seg->free_queues)[m->pool];
@@ -1270,14 +1280,14 @@
 		if (low <= seg->start)
 			m_start = seg->first_page;
 		else
-			m_start = &seg->first_page[atop(low - seg->start)];
+			m_start = vm_phys_paddr_seg_page(low, seg);
 		if (high < seg->end)
 			pa_end = high;
 		else
 			pa_end = seg->end;
 		if (pa_end - VM_PAGE_TO_PHYS(m_start) < ptoa(npages))
 			continue;
-		m_end = &seg->first_page[atop(pa_end - seg->start)];
+		m_end = vm_phys_paddr_seg_page(pa_end, seg);
 		m_run = vm_page_scan_contig(npages, m_start, m_end,
 		    alignment, boundary, options);
 		if (m_run != NULL)
@@ -1314,7 +1324,7 @@
 		order++;
 		pa = m->phys_addr & (~(vm_paddr_t)0 << (PAGE_SHIFT + order));
 		if (pa >= seg->start)
-			m_set = &seg->first_page[atop(pa - seg->start)];
+			m_set = vm_phys_paddr_seg_page(pa, seg);
 		else
 			return (FALSE);
 	}
@@ -1339,10 +1349,10 @@
 		order--;
 		pa_half = m_set->phys_addr ^ (1 << (PAGE_SHIFT + order));
 		if (m->phys_addr < pa_half)
-			m_tmp = &seg->first_page[atop(pa_half - seg->start)];
+			m_tmp = vm_phys_paddr_seg_page(pa_half, seg);
 		else {
 			m_tmp = m_set;
-			m_set = &seg->first_page[atop(pa_half - seg->start)];
+			m_set = vm_phys_paddr_seg_page(pa_half, seg);
 		}
 		vm_freelist_add(fl, m_tmp, order, 0);
 	}
@@ -1427,38 +1437,6 @@
 		for (pind = 0; pind < VM_NFREEPOOL; pind++) {
 			fl = (*seg->free_queues)[pind];
 			TAILQ_FOREACH(m_ret, &fl[oind].pl, listq) {
-				/*
-				 * Is the size of this allocation request
-				 * larger than the largest block size?
-				 */
-				if (order >= VM_NFREEORDER) {
-					/*
-					 * Determine if a sufficient number of
-					 * subsequent blocks to satisfy the
-					 * allocation request are free.
-					 */
-					pa = VM_PAGE_TO_PHYS(m_ret);
-					pa_end = pa + size;
-					if (pa_end < pa)
-						continue;
-					for (;;) {
-						pa += 1 << (PAGE_SHIFT +
-						    VM_NFREEORDER - 1);
-						if (pa >= pa_end ||
-						    pa < seg->start ||
-						    pa >= seg->end)
-							break;
-						m = &seg->first_page[atop(pa -
-						    seg->start)];
-						if (m->order != VM_NFREEORDER -
-						    1)
-							break;
-					}
-					/* If not, go to the next block. */
-					if (pa < pa_end)
-						continue;
-				}
-
 				/*
 				 * Determine if the blocks are within the
 				 * given range, satisfy the given alignment,
@@ -1466,8 +1444,29 @@
 				 */
 				pa = VM_PAGE_TO_PHYS(m_ret);
 				pa_end = pa + size;
-				if (pa >= low && pa_end <= high &&
-				    vm_addr_ok(pa, size, alignment, boundary))
+				if (pa < low || pa_end > high ||
+				    !vm_addr_ok(pa, size, alignment, boundary))
+					continue;
+
+				/*
+				 * Is the size of this allocation request
+				 * no more than the largest block size?
+				 */
+				if (order < VM_NFREEORDER)
+					goto done;
+
+				/*
+				 * Determine if a sufficient number of
+				 * subsequent blocks to satisfy the
+				 * allocation request are free.
+				 */
+				if (pa_end < pa || pa_end > seg->end)
+					continue;
+				do
+					pa += 1 << (PAGE_SHIFT + oind);
+				while (pa < pa_end && oind ==
+				    vm_phys_paddr_seg_page(pa, seg)->order);
+				if (pa >= pa_end)
 					goto done;
 			}
 		}