Index: sys/vm/vm_page.h
===================================================================
--- sys/vm/vm_page.h
+++ sys/vm/vm_page.h
@@ -511,7 +511,7 @@
 int vm_page_trysbusy(vm_page_t m);
 void vm_page_unhold_pages(vm_page_t *ma, int count);
 void vm_page_unswappable(vm_page_t m);
-boolean_t vm_page_unwire(vm_page_t m, uint8_t queue);
+bool vm_page_unwire(vm_page_t m, uint8_t queue);
 void vm_page_updatefake(vm_page_t m, vm_paddr_t paddr, vm_memattr_t memattr);
 void vm_page_wire (vm_page_t);
 void vm_page_xunbusy_hard(vm_page_t m);
Index: sys/vm/vm_page.c
===================================================================
--- sys/vm/vm_page.c
+++ sys/vm/vm_page.c
@@ -2726,9 +2726,7 @@
 			if (queue != PQ_NONE)
 				vm_page_dequeue(m);
 			vm_page_enqueue(PQ_ACTIVE, m);
-		} else
-			KASSERT(queue == PQ_NONE,
-			    ("vm_page_activate: wired page %p is queued", m));
+		}
 	} else {
 		if (m->act_count < ACT_INIT)
 			m->act_count = ACT_INIT;
@@ -2846,11 +2844,8 @@
 /*
  *	vm_page_wire:
  *
- *	Mark this page as wired down by yet
- *	another map, removing it from paging queues
- *	as necessary.
- *
- *	If the page is fictitious, then its wire count must remain one.
+ *	Mark this page as wired down.  If the page is fictitious, then
+ *	its wire count must remain one.
  *
  *	The page must be locked.
  */
@@ -2858,12 +2853,7 @@
 vm_page_wire(vm_page_t m)
 {
 
-	/*
-	 * Only bump the wire statistics if the page is not already wired,
-	 * and only unqueue the page if it is on some queue (if it is unmanaged
-	 * it is already off the queues).
-	 */
-	vm_page_lock_assert(m, MA_OWNED);
+	vm_page_assert_locked(m);
 	if ((m->flags & PG_FICTITIOUS) != 0) {
 		KASSERT(m->wire_count == 1,
 		    ("vm_page_wire: fictitious page %p's wire count isn't one",
@@ -2874,7 +2864,6 @@
 		KASSERT((m->oflags & VPO_UNMANAGED) == 0 ||
 		    m->queue == PQ_NONE,
 		    ("vm_page_wire: unmanaged page %p is queued", m));
-		vm_page_remque(m);
 		atomic_add_int(&vm_cnt.v_wire_count, 1);
 	}
 	m->wire_count++;
@@ -2897,7 +2886,7 @@
  *
  * A managed page must be locked.
  */
-boolean_t
+bool
 vm_page_unwire(vm_page_t m, uint8_t queue)
 {
 
@@ -2911,18 +2900,29 @@
 	    ("vm_page_unwire: fictitious page %p's wire count isn't one", m));
 		return (FALSE);
 	}
-	if (m->wire_count > 0) {
-		m->wire_count--;
-		if (m->wire_count == 0) {
-			atomic_subtract_int(&vm_cnt.v_wire_count, 1);
-			if ((m->oflags & VPO_UNMANAGED) == 0 &&
-			    m->object != NULL && queue != PQ_NONE)
+	if (m->wire_count == 0)
+		panic("vm_page_unwire: page %p's wire count is zero", m);
+	m->wire_count--;
+	if (m->wire_count == 0) {
+		atomic_subtract_int(&vm_cnt.v_wire_count, 1);
+		if ((m->oflags & VPO_UNMANAGED) == 0 && m->object != NULL &&
+		    queue != PQ_NONE) {
+			if (m->queue == queue) {
+				if (queue == PQ_ACTIVE)
+					vm_page_reference(m);
+				else
+					vm_page_requeue(m);
+			} else {
+				vm_page_remque(m);
 				vm_page_enqueue(queue, m);
-			return (TRUE);
-		} else
-			return (FALSE);
+				if (queue == PQ_ACTIVE)
+					/* Initialize act_count. */
+					vm_page_activate(m);
+			}
+		}
+		return (true);
 	} else
-		panic("vm_page_unwire: page %p's wire count is zero", m);
+		return (false);
 }
 
 /*
Index: sys/vm/vm_pageout.c
===================================================================
--- sys/vm/vm_pageout.c
+++ sys/vm/vm_pageout.c
@@ -397,9 +397,6 @@
 	VM_OBJECT_ASSERT_WLOCKED(object);
 	pindex = m->pindex;
 
-	/*
-	 * We can't clean the page if it is busy or held.
-	 */
 	vm_page_assert_unbusied(m);
 	KASSERT(m->hold_count == 0, ("page %p is held", m));
 
@@ -441,7 +438,7 @@
 		}
 		vm_page_lock(p);
 		if (!vm_page_in_laundry(p) ||
-		    p->hold_count != 0) {	/* may be undergoing I/O */
+		    p->hold_count != 0 || p->wire_count != 0) {
 			vm_page_unlock(p);
 			ib = 0;
 			break;
@@ -468,7 +465,7 @@
 			break;
 		vm_page_lock(p);
 		if (!vm_page_in_laundry(p) ||
-		    p->hold_count != 0) {	/* may be undergoing I/O */
+		    p->hold_count != 0 || p->wire_count != 0) {
 			vm_page_unlock(p);
 			break;
 		}
@@ -964,11 +961,19 @@
 			vm_page_unlock(m);
 			continue;
 		}
+		if (m->wire_count != 0) {
+			vm_page_dequeue_locked(m);
+			vm_page_unlock(m);
+			continue;
+		}
 		object = m->object;
 		if ((!VM_OBJECT_TRYWLOCK(object) &&
 		    (!vm_pageout_fallback_object_lock(m, &next) ||
-		    m->hold_count != 0)) || vm_page_busied(m)) {
+		    m->hold_count != 0 || m->wire_count != 0)) ||
+		    vm_page_busied(m)) {
 			VM_OBJECT_WUNLOCK(object);
+			if (m->wire_count != 0 && vm_page_pagequeue(m) == pq)
+				vm_page_dequeue_locked(m);
 			vm_page_unlock(m);
 			continue;
 		}
@@ -1404,7 +1409,16 @@
 		 */
 		if (!vm_pageout_page_lock(m, &next))
 			goto unlock_page;
-		else if (m->hold_count != 0) {
+		else if (m->wire_count != 0) {
+			/*
+			 * Wired pages may not be freed, and unwiring a queued
+			 * page will cause it to be requeued.  Thus, remove them
+			 * from the queue now to avoid unnecessary revisits.
+			 */
+			vm_page_dequeue_locked(m);
+			addl_page_shortage++;
+			goto unlock_page;
+		} else if (m->hold_count != 0) {
 			/*
 			 * Held pages are essentially stuck in the
 			 * queue.  So, they ought to be discounted
@@ -1419,7 +1433,11 @@
 		if (!VM_OBJECT_TRYWLOCK(object)) {
 			if (!vm_pageout_fallback_object_lock(m, &next))
 				goto unlock_object;
-			else if (m->hold_count != 0) {
+			else if (m->wire_count != 0) {
+				vm_page_dequeue_locked(m);
+				addl_page_shortage++;
+				goto unlock_object;
+			} else if (m->hold_count != 0) {
 				addl_page_shortage++;
 				goto unlock_object;
 			}
@@ -1441,6 +1459,7 @@
 			continue;
 		}
 		KASSERT(m->hold_count == 0, ("Held page %p", m));
+		KASSERT(m->wire_count == 0, ("Wired page %p", m));
 
 		/*
 		 * Dequeue the inactive page and unlock the inactive page
@@ -1641,6 +1660,15 @@
 		 */
 		VM_CNT_INC(v_pdpages);
 
+		/*
+		 * Wired pages are dequeued lazily.
+		 */
+		if (m->wire_count != 0) {
+			vm_page_dequeue_locked(m);
+			vm_page_unlock(m);
+			continue;
+		}
+
 		/*
 		 * Check to see "how much" the page has been used.
 		 */