From owner-svn-src-user@FreeBSD.ORG  Mon Apr 19 22:15:41 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9DA01065670;
	Mon, 19 Apr 2010 22:15:41 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A78FA8FC19;
	Mon, 19 Apr 2010 22:15:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3JMFeIh031748;
	Mon, 19 Apr 2010 22:15:40 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JMFeKB031745;
	Mon, 19 Apr 2010 22:15:40 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004192215.o3JMFeKB031745@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 19 Apr 2010 22:15:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206877 - user/kmacy/head_page_lock_2/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Apr 2010 22:15:42 -0000

Author: kmacy
Date: Mon Apr 19 22:15:40 2010
New Revision: 206877
URL: http://svn.freebsd.org/changeset/base/206877

Log:
  fix mistake in sanity check change to pageout

Modified:
  user/kmacy/head_page_lock_2/sys/vm/vm_page.h
  user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c

Modified: user/kmacy/head_page_lock_2/sys/vm/vm_page.h
==============================================================================
--- user/kmacy/head_page_lock_2/sys/vm/vm_page.h	Mon Apr 19 22:10:40 2010	(r206876)
+++ user/kmacy/head_page_lock_2/sys/vm/vm_page.h	Mon Apr 19 22:15:40 2010	(r206877)
@@ -276,9 +276,11 @@ extern struct vpglocks vm_page_queue_loc
 #ifdef VM_PAGE_LOCK
 #define	vm_page_lockptr(m)		pmap_page_lockptr(m)
 #define	vm_page_lock_queues_assert_notowned()   mtx_assert(&vm_page_queue_mtx, MA_NOTOWNED)
+#define	vm_page_lock_assert_notowned(m)   vm_page_lock_assert((m), MA_NOTOWNED)
 #else
 #define	vm_page_lockptr(m)		(&vm_page_queue_mtx)
-#define	vm_page_lock_queues_assert_notowned()   
+#define	vm_page_lock_queues_assert_notowned()
+#define	vm_page_lock_assert_notowned()  
 #endif
 #define	vm_page_lock(m)		mtx_lock(vm_page_lockptr((m)))
 #define	vm_page_unlock(m)	mtx_unlock(vm_page_lockptr((m)))

Modified: user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c	Mon Apr 19 22:10:40 2010	(r206876)
+++ user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c	Mon Apr 19 22:15:40 2010	(r206877)
@@ -1043,7 +1043,7 @@ rescan0:
 			}
 			vm_page_lock_queues();
 unlock_and_continue:
-			vm_page_lock_queues_assert_notowned();
+			vm_page_lock_assert_notowned(m);
 			VM_OBJECT_UNLOCK(object);
 			if (mp != NULL) {
 				vm_page_unlock_queues();
@@ -1057,9 +1057,7 @@ unlock_and_continue:
 			next = TAILQ_NEXT(&marker, pageq);
 			TAILQ_REMOVE(&vm_page_queues[PQ_INACTIVE].pl,
 				     &marker, pageq);
-#ifdef VM_PAGE_LOCK
-			vm_page_lock_assert(m, MA_NOTOWNED);
-#endif			
+			vm_page_lock_assert_notowned(m);
 			continue;
 		}
 		vm_page_unlock(m);