From owner-cvs-src@FreeBSD.ORG  Fri Mar  5 14:03:11 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id CD9CE16A4CE; Fri,  5 Mar 2004 14:03:11 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C78FF43D2F; Fri,  5 Mar 2004 14:03:11 -0800 (PST)
	(envelope-from truckman@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i25M3BGe008495;
	Fri, 5 Mar 2004 14:03:11 -0800 (PST)
	(envelope-from truckman@repoman.freebsd.org)
Received: (from truckman@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i25M3BdE008494;
	Fri, 5 Mar 2004 14:03:11 -0800 (PST)
	(envelope-from truckman)
Message-Id: <200403052203.i25M3BdE008494@repoman.freebsd.org>
From: Don Lewis <truckman@FreeBSD.org>
Date: Fri, 5 Mar 2004 14:03:11 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/kern kern_sysctl.c src/sys/vm vm_extern.h
 vm_glue.c vm_mmap.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Mar 2004 22:03:12 -0000

truckman    2004/03/05 14:03:11 PST

  FreeBSD src repository

  Modified files:
    sys/kern             kern_sysctl.c 
    sys/vm               vm_extern.h vm_glue.c vm_mmap.c 
  Log:
  Undo the merger of mlock()/vslock and munlock()/vsunlock() and the
  introduction of kern_mlock() and kern_munlock() in
          src/sys/kern/kern_sysctl.c      1.150
          src/sys/vm/vm_extern.h          1.69
          src/sys/vm/vm_glue.c            1.190
          src/sys/vm/vm_mmap.c            1.179
  because different resource limits are appropriate for transient and
  "permanent" page wiring requests.
  
  Retain the kern_mlock() and kern_munlock() API in the revived
  vslock() and vsunlock() functions.
  
  Combine the best parts of each of the original sets of implementations
  with further code cleanup.  Make the mclock() and vslock()
  implementations as similar as possible.
  
  Retain the RLIMIT_MEMLOCK check in mlock().  Move the most strigent
  test, which can return EAGAIN, last so that requests that have no
  hope of ever being satisfied will not be retried unnecessarily.
  
  Disable the test that can return EAGAIN in the vslock() implementation
  because it will cause the sysctl code to wedge.
  
  Tested by:      Cy Schubert <Cy.Schubert AT komquats.com>
  
  Revision  Changes    Path
  1.152     +3 -3      src/sys/kern/kern_sysctl.c
  1.70      +2 -2      src/sys/vm/vm_extern.h
  1.191     +78 -0     src/sys/vm/vm_glue.c
  1.182     +33 -48    src/sys/vm/vm_mmap.c