 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_pglist.c,v 1.54 2011/01/21 19:27:09 matt Exp $	*/
+/*	$NetBSD: uvm_pglist.c,v 1.55 2011/01/22 01:36:27 matt Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * uvm_pglist.c: pglist functions
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.54 2011/01/21 19:27:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.55 2011/01/22 01:36:27 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_pdpolicy.h>
 #ifdef VM_PAGE_ALLOC_MEMORY_STATS
 #define	STAT_INCR(v)	(v)++
 #define	STAT_DECR(v)	do { \
 		if ((v) == 0) \
 @@ -274,27 +274,32 @@ uvm_pglistalloc_c_ps(struct vm_physseg *
 		try += cnt;
+	}
 	/*
 	 * we have a chunk of memory that conforms to the requested constraints.
 	 */
 	for (idx = tryidx, pgs += idx; idx < end; idx++, pgs++)
 		uvm_pglist_add(pgs, rlist);
 	/*
 	 * the next time we need to search this segment, start after this
 	 * chunk of pages we just allocated.
 	 */
-	ps->start_hint = tryidx + num;
+	ps->start_hint = try + num - ps->avail_start;
 	KASSERTMSG(ps->start_hint <= ps->avail_end - ps->avail_start,
 	    ("%x %u (%#x) <= %#"PRIxPADDR" - %#"PRIxPADDR" (%#"PRIxPADDR")",
 	    try + num,
 	    ps->start_hint, ps->start_hint, ps->avail_end, ps->avail_start,
 	    ps->avail_end - ps->avail_start));
 #ifdef PGALLOC_VERBOSE
 	printf("got %d pgs\n", num);
 #endif
 	return num; /* number of pages allocated */
+}
 static int
 uvm_pglistalloc_contig(int num, paddr_t low, paddr_t high, paddr_t alignment,
     paddr_t boundary, struct pglist *rlist)
+{
 	int fl, psi;
 	struct vm_physseg *ps;
 @@ -400,27 +405,32 @@ uvm_pglistalloc_s_ps(struct vm_physseg *
 		if (VM_PAGE_IS_FREE(pg) == 0)
 			continue;
 		uvm_pglist_add(pg, rlist);
 		if (--todo == 0) {
 			break;
+		}
+	}
 	/*
 	 * The next time we need to search this segment,
 	 * start just after the pages we just allocated.
 	 */
-	ps->start_hint = try + 1 - ps->start;
+	ps->start_hint = try + 1 - ps->avail_start;
 	KASSERTMSG(ps->start_hint <= ps->avail_end - ps->avail_start,
 	    ("%#x %u (%#x) <= %#"PRIxPADDR" - %#"PRIxPADDR" (%#"PRIxPADDR")",
 	    try + 1,
 	    ps->start_hint, ps->start_hint, ps->avail_end, ps->avail_start,
 	    ps->avail_end - ps->avail_start));
 #ifdef PGALLOC_VERBOSE
 	printf("got %d pgs\n", num - todo);
 #endif
 	return (num - todo); /* number of pages allocated */
+}
 static int
 uvm_pglistalloc_simple(int num, paddr_t low, paddr_t high,
     struct pglist *rlist, int waitok)
+{
 	int fl, psi, error;
 	struct vm_physseg *ps;