From owner-svn-src-head@FreeBSD.ORG  Fri Jan 24 19:08:43 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7AB86F0B;
 Fri, 24 Jan 2014 19:08:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6702A1F8A;
 Fri, 24 Jan 2014 19:08:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0OJ8hRg078969;
 Fri, 24 Jan 2014 19:08:43 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0OJ8h0T078968;
 Fri, 24 Jan 2014 19:08:43 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201401241908.s0OJ8h0T078968@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 24 Jan 2014 19:08:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261135 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jan 2014 19:08:43 -0000

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);