From owner-p4-projects@FreeBSD.ORG  Thu Aug  3 20:40:18 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4A76C16A4E7; Thu,  3 Aug 2006 20:40:18 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E892516A4E5
	for <perforce@freebsd.org>; Thu,  3 Aug 2006 20:40:17 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1D42F43D6D
	for <perforce@freebsd.org>; Thu,  3 Aug 2006 20:40:15 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73KeERY068698
	for <perforce@freebsd.org>; Thu, 3 Aug 2006 20:40:14 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73KeEVW068695
	for perforce@freebsd.org; Thu, 3 Aug 2006 20:40:14 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 3 Aug 2006 20:40:14 GMT
Message-Id: <200608032040.k73KeEVW068695@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 103134 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Aug 2006 20:40:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=103134

Change 103134 by jb@jb_freebsd2 on 2006/08/03 20:39:43

	Catch up with the VM changes in -current.
	
	We probably should merge sun4v into current so that we don't have
	to chase things like this.

Affected files ...

.. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#11 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#11 (text+ko) ====

@@ -1528,22 +1528,12 @@
 	m->md.pv_list_count = 0;
 }
 
-/*
- * Lower the permission for all mappings to a given page.
- */
 void
-pmap_page_protect(vm_page_t m, vm_prot_t prot)
+pmap_remove_write(vm_page_t m)
 {
-	
-	DPRINTF("pmap_page_protect(0x%lx, %d)\n", VM_PAGE_TO_PHYS(m), prot);
+	DPRINTF("pmap_remove_write(0x%lx)\n", VM_PAGE_TO_PHYS(m));
 
-	if ((prot & VM_PROT_WRITE) == 0) {
-		if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) {
-			tte_clear_phys_bit(m, VTD_SW_W);
-		} else {
-			pmap_remove_all(m);
-		}
-	}
+	tte_clear_phys_bit(m, VTD_SW_W);
 }
 
 /*