svn commit: r210548 - head/sys/vm

[Edward Tomasz Napierala]

Author: trasz
Date: Tue Jul 27 19:26:18 2010
New Revision: 210548
URL: http://svn.freebsd.org/changeset/base/210548

Log:
  Fix commented out resource limit check in mlockall(2).  It's still racy,
  but at least less misleading.

Modified:
  head/sys/vm/vm_mmap.c

Modified: head/sys/vm/vm_mmap.c
==============================================================================
--- head/sys/vm/vm_mmap.c	Tue Jul 27 17:33:51 2010	(r210547)
+++ head/sys/vm/vm_mmap.c	Tue Jul 27 19:26:18 2010	(r210548)
@@ -1082,8 +1082,7 @@ mlockall(td, uap)
 	 * a hard resource limit, return ENOMEM.
 	 */
 	PROC_LOCK(td->td_proc);
-	if (map->size - ptoa(pmap_wired_count(vm_map_pmap(map)) >
-		lim_cur(td->td_proc, RLIMIT_MEMLOCK))) {
+	if (map->size > lim_cur(td->td_proc, RLIMIT_MEMLOCK)) {
 		PROC_UNLOCK(td->td_proc);
 		return (ENOMEM);
 	}