From owner-svn-src-all@FreeBSD.ORG  Fri Nov 27 22:08:29 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 69992106568D;
	Fri, 27 Nov 2009 22:08:29 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 592C98FC14;
	Fri, 27 Nov 2009 22:08:29 +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 nARM8Tt8031041;
	Fri, 27 Nov 2009 22:08:29 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nARM8TRB031039;
	Fri, 27 Nov 2009 22:08:29 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200911272208.nARM8TRB031039@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 27 Nov 2009 22:08:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199869 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Nov 2009 22:08:29 -0000

Author: alc
Date: Fri Nov 27 22:08:29 2009
New Revision: 199869
URL: http://svn.freebsd.org/changeset/base/199869

Log:
  Support the new VM_PROT_COPY option on wired pages.  The effect of which
  is that a debugger can now set a breakpoint in a program that uses mlock(2)
  on its text segment or mlockall(2) on its entire address space.

Modified:
  head/sys/vm/vm_fault.c

Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Fri Nov 27 20:24:11 2009	(r199868)
+++ head/sys/vm/vm_fault.c	Fri Nov 27 22:08:29 2009	(r199869)
@@ -273,7 +273,7 @@ RetryFault:;
 	fs.lookup_still_valid = TRUE;
 
 	if (wired)
-		fault_type = prot;
+		fault_type = prot | (fault_type & VM_PROT_COPY);
 
 	fs.first_m = NULL;
 
@@ -759,8 +759,11 @@ vnode_locked:
 				 */
 				pmap_copy_page(fs.m, fs.first_m);
 				fs.first_m->valid = VM_PAGE_BITS_ALL;
-			}
-			if (fs.m) {
+				if (wired && (fault_flags &
+				    VM_FAULT_CHANGE_WIRING) == 0) {
+					vm_page_wire(fs.first_m);
+					vm_page_unwire(fs.m, FALSE);
+				}
 				/*
 				 * We no longer need the old page or object.
 				 */