From owner-p4-projects  Thu Mar  6 15:13:24 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B7EF137B405; Thu,  6 Mar 2003 15:13:21 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 47D4437B401
	for <perforce@freebsd.org>; Thu,  6 Mar 2003 15:13:21 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E93A943F93
	for <perforce@freebsd.org>; Thu,  6 Mar 2003 15:13:20 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h26NDK0U068019
	for <perforce@freebsd.org>; Thu, 6 Mar 2003 15:13:20 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h26NDKpI068016
	for perforce@freebsd.org; Thu, 6 Mar 2003 15:13:20 -0800 (PST)
Date: Thu, 6 Mar 2003 15:13:20 -0800 (PST)
Message-Id: <200303062313.h26NDKpI068016@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 26451 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=26451

Change 26451 by jhb@jhb_laptop on 2003/03/06 15:12:31

	Kill MTX_SLEEPABLE, witness would have panic'd anyways.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_mutex.c#62 edit
.. //depot/projects/smpng/sys/sys/mutex.h#33 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_mutex.c#62 (text+ko) ====

@@ -920,7 +920,7 @@
 	struct lock_object *lock;
 
 	MPASS((opts & ~(MTX_SPIN | MTX_QUIET | MTX_RECURSE |
-	    MTX_SLEEPABLE | MTX_NOWITNESS | MTX_DUPOK)) == 0);
+	    MTX_NOWITNESS | MTX_DUPOK)) == 0);
 
 #ifdef MUTEX_DEBUG
 	/* Diagnostic and error correction */
@@ -941,8 +941,6 @@
 		lock->lo_flags = LO_QUIET;
 	if (opts & MTX_RECURSE)
 		lock->lo_flags |= LO_RECURSABLE;
-	if (opts & MTX_SLEEPABLE)
-		lock->lo_flags |= LO_SLEEPABLE;
 	if ((opts & MTX_NOWITNESS) == 0)
 		lock->lo_flags |= LO_WITNESS;
 	if (opts & MTX_DUPOK)

==== //depot/projects/smpng/sys/sys/mutex.h#33 (text+ko) ====

@@ -56,7 +56,6 @@
 #define MTX_SPIN	0x00000001	/* Spin lock (disables interrupts) */
 #define MTX_RECURSE	0x00000004	/* Option: lock allowed to recurse */
 #define	MTX_NOWITNESS	0x00000008	/* Don't do any witness checking. */
-#define	MTX_SLEEPABLE	0x00000010	/* We can sleep with this lock. */
 #define	MTX_DUPOK	0x00000020	/* Don't log a duplicate acquire */
 
 /*

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