svn commit: r261135 - head/sys/vm

[Alan Cox]

Author: alc
Date: Fri Jan 24 19:08:42 2014
New Revision: 261135
URL: http://svnweb.freebsd.org/changeset/base/261135

Log:
  In an effort to diagnose possible corruption of struct vm_page on some
  sparc64 machines make the page queue assert in vm_page_dequeue() more
  precise.  While I'm here switch the page lock assert to the newer style.

Modified:
  head/sys/vm/vm_page.c

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Fri Jan 24 18:52:04 2014	(r261134)
+++ head/sys/vm/vm_page.c	Fri Jan 24 19:08:42 2014	(r261135)
@@ -2028,8 +2028,8 @@ vm_page_dequeue(vm_page_t m)
 {
 	struct vm_pagequeue *pq;
 
-	vm_page_lock_assert(m, MA_OWNED);
-	KASSERT(m->queue != PQ_NONE,
+	vm_page_assert_locked(m);
+	KASSERT(m->queue == PQ_ACTIVE || m->queue == PQ_INACTIVE,
 	    ("vm_page_dequeue: page %p is not queued", m));
 	pq = vm_page_pagequeue(m);
 	vm_pagequeue_lock(pq);