From owner-cvs-all  Tue Apr 17 22:15:41 2001
Delivered-To: cvs-all@freebsd.org
Received: from fw.wintelcom.net (ns1.wintelcom.net [209.1.153.20])
	by hub.freebsd.org (Postfix) with ESMTP
	id 98A5737B422; Tue, 17 Apr 2001 22:15:35 -0700 (PDT)
	(envelope-from bright@fw.wintelcom.net)
Received: (from bright@localhost)
	by fw.wintelcom.net (8.10.0/8.10.0) id f3I5FW709730;
	Tue, 17 Apr 2001 22:15:32 -0700 (PDT)
Date: Tue, 17 Apr 2001 22:15:32 -0700
From: Alfred Perlstein <alfred@FreeBSD.org>
To: Tor.Egge@fast.no
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/vm vm_map.h
Message-ID: <20010417221532.K976@fw.wintelcom.net>
References: <200104130807.f3D87cj83715@freefall.freebsd.org> <200104180507.HAA36435@midten.fast.no>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <200104180507.HAA36435@midten.fast.no>; from Tor.Egge@fast.no on Wed, Apr 18, 2001 at 07:07:09AM +0200
X-all-your-base: are belong to us.
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

* Tor.Egge@fast.no <Tor.Egge@fast.no> [010417 22:07] wrote:
> > alfred      2001/04/13 01:07:38 PDT
> > 
> >   Modified files:
> >     sys/vm               vm_map.h 
> >   Log:
> >   Use a macro wrapper over printf along with KASSERT to reduce the amount
> >   of code here.
> >   
> >   Revision  Changes    Path
> >   1.59      +16 -41    src/sys/vm/vm_map.h
> 
> On kernels without the INVARIANT option vm_map_lock() no longer locks
> the vm map.
> 
> Replacing the KASSERT with if/panic solves the problem.

go ahead and commit it, sorry for the breakage.

> 
> Index: vm_map.h
> ===================================================================
> RCS file: /home/ncvs/src/sys/vm/vm_map.h,v
> retrieving revision 1.60
> diff -u -r1.60 vm_map.h
> --- vm_map.h	2001/04/13 10:22:14	1.60
> +++ vm_map.h	2001/04/18 04:41:03
> @@ -223,8 +223,8 @@
>  #define	vm_map_lock(map) \
>  	do { \
>  		vm_map_printf("locking map LK_EXCLUSIVE: %p\n", map); \
> -		KASSERT(lockmgr(&(map)->lock, LK_EXCLUSIVE, (void *)0, curproc) == 0, \
> -			("vm_map_lock: failed to get lock")); \
> +		if (lockmgr(&(map)->lock, LK_EXCLUSIVE, (void *)0, curproc) != 0) \
> +		    panic("vm_map_lock: failed to get lock"); \
>  		(map)->timestamp++; \
>  	} while(0)
>  
> 
> - Tor Egge

-- 
-Alfred Perlstein - [bright@wintelcom.net|alfred@freebsd.org]
Represent yourself, show up at BABUG http://www.babug.org/

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message