From owner-cvs-all  Tue Apr 17 22: 7:17 2001
Delivered-To: cvs-all@freebsd.org
Received: from midten.fast.no (midten.fast.no [213.188.8.11])
	by hub.freebsd.org (Postfix) with ESMTP
	id C08DD37B422; Tue, 17 Apr 2001 22:07:10 -0700 (PDT)
	(envelope-from Tor.Egge@fast.no)
Received: from fast.no (IDENT:tegge@midten.fast.no [213.188.8.11])
	by midten.fast.no (8.9.3/8.9.3) with ESMTP id HAA36435;
	Wed, 18 Apr 2001 07:07:09 +0200 (CEST)
Message-Id: <200104180507.HAA36435@midten.fast.no>
To: alfred@FreeBSD.org
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/vm vm_map.h
From: Tor.Egge@fast.no
In-Reply-To: Your message of "Fri, 13 Apr 2001 01:07:38 -0700 (PDT)"
References: <200104130807.f3D87cj83715@freefall.freebsd.org>
X-Mailer: Mew version 1.70 on Emacs 19.34.1
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Date: Wed, 18 Apr 2001 07:07:09 +0200
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

> 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.

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

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