From owner-svn-src-all@FreeBSD.ORG  Wed Sep  5 18:19:54 2012
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 D59A2106564A;
	Wed,  5 Sep 2012 18:19:54 +0000 (UTC)
	(envelope-from zont@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C10608FC0C;
	Wed,  5 Sep 2012 18:19:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q85IJsg3080770;
	Wed, 5 Sep 2012 18:19:54 GMT (envelope-from zont@svn.freebsd.org)
Received: (from zont@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q85IJsA6080768;
	Wed, 5 Sep 2012 18:19:54 GMT (envelope-from zont@svn.freebsd.org)
Message-Id: <201209051819.q85IJsA6080768@svn.freebsd.org>
From: Andrey Zonov <zont@FreeBSD.org>
Date: Wed, 5 Sep 2012 18:19:54 +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: r240145 - 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: Wed, 05 Sep 2012 18:19:54 -0000

Author: zont
Date: Wed Sep  5 18:19:54 2012
New Revision: 240145
URL: http://svn.freebsd.org/changeset/base/240145

Log:
  - Simplify VM code by using vmspace_wired_count() for counting wired
  memory of a process.
  
  Reviewed by:	avg
  Approved by:	kib (mentor)
  MFC after:	2 weeks

Modified:
  head/sys/vm/vm_mmap.c

Modified: head/sys/vm/vm_mmap.c
==============================================================================
--- head/sys/vm/vm_mmap.c	Wed Sep  5 17:13:08 2012	(r240144)
+++ head/sys/vm/vm_mmap.c	Wed Sep  5 18:19:54 2012	(r240145)
@@ -1050,8 +1050,7 @@ sys_mlock(td, uap)
 		return (ENOMEM);
 	proc = td->td_proc;
 	PROC_LOCK(proc);
-	nsize = ptoa(npages +
-	    pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map)));
+	nsize = ptoa(npages + vmspace_wired_count(proc->p_vmspace));
 	if (nsize > lim_cur(proc, RLIMIT_MEMLOCK)) {
 		PROC_UNLOCK(proc);
 		return (ENOMEM);
@@ -1072,7 +1071,7 @@ sys_mlock(td, uap)
 	if (error != KERN_SUCCESS) {
 		PROC_LOCK(proc);
 		racct_set(proc, RACCT_MEMLOCK,
-		    ptoa(pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map))));
+		    ptoa(vmspace_wired_count(proc->p_vmspace)));
 		PROC_UNLOCK(proc);
 	}
 #endif
@@ -1148,7 +1147,7 @@ sys_mlockall(td, uap)
 	if (error != KERN_SUCCESS) {
 		PROC_LOCK(td->td_proc);
 		racct_set(td->td_proc, RACCT_MEMLOCK,
-		    ptoa(pmap_wired_count(vm_map_pmap(&td->td_proc->p_vmspace->vm_map))));
+		    ptoa(vmspace_wired_count(td->td_proc->p_vmspace)));
 		PROC_UNLOCK(td->td_proc);
 	}
 #endif