From owner-svn-src-user@FreeBSD.ORG  Thu Apr 29 22:13:27 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B5F431065672;
	Thu, 29 Apr 2010 22:13:27 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id A53508FC0A;
	Thu, 29 Apr 2010 22:13:27 +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 o3TMDREG073866;
	Thu, 29 Apr 2010 22:13:27 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3TMDRRh073863;
	Thu, 29 Apr 2010 22:13:27 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004292213.o3TMDRRh073863@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 29 Apr 2010 22:13:27 +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: r207393 - user/kmacy/head_page_lock_incr/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: Thu, 29 Apr 2010 22:13:27 -0000

Author: kmacy
Date: Thu Apr 29 22:13:27 2010
New Revision: 207393
URL: http://svn.freebsd.org/changeset/base/207393

Log:
  - define PDRSHIFT for !x86
  - add page lock assert in dirty check

Modified:
  user/kmacy/head_page_lock_incr/sys/vm/vm_page.c
  user/kmacy/head_page_lock_incr/sys/vm/vm_page.h

Modified: user/kmacy/head_page_lock_incr/sys/vm/vm_page.c
==============================================================================
--- user/kmacy/head_page_lock_incr/sys/vm/vm_page.c	Thu Apr 29 22:03:09 2010	(r207392)
+++ user/kmacy/head_page_lock_incr/sys/vm/vm_page.c	Thu Apr 29 22:13:27 2010	(r207393)
@@ -2179,6 +2179,7 @@ vm_page_is_valid(vm_page_t m, int base, 
 void
 vm_page_test_dirty(vm_page_t m)
 {
+	vm_page_lock_assert(m, MA_OWNED);
 	if ((m->dirty != VM_PAGE_BITS_ALL) && pmap_is_modified(m)) {
 		vm_page_dirty(m);
 	}

Modified: user/kmacy/head_page_lock_incr/sys/vm/vm_page.h
==============================================================================
--- user/kmacy/head_page_lock_incr/sys/vm/vm_page.h	Thu Apr 29 22:03:09 2010	(r207392)
+++ user/kmacy/head_page_lock_incr/sys/vm/vm_page.h	Thu Apr 29 22:13:27 2010	(r207393)
@@ -179,6 +179,12 @@ struct vpglocks {
 extern struct vpglocks vm_page_queue_free_lock;
 extern struct vpglocks pa_lock[];
 
+#if defined(__arm__)
+#define	PDRSHIFT	PDR_SHIFT
+#elif !defined(PDRSHIFT)
+#define PDRSHIFT	21
+#endif
+
 #define	pa_index(pa)	((pa) >> PDRSHIFT)
 #define	PA_LOCKPTR(pa)	&pa_lock[pa_index((pa)) % PA_LOCK_COUNT].data
 #define	PA_LOCKOBJPTR(pa)	((struct lock_object *)PA_LOCKPTR((pa)))