From owner-p4-projects@FreeBSD.ORG  Fri Feb  3 20:09:32 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E6CE316A423; Fri,  3 Feb 2006 20:09:31 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 A2EE616A420
	for <perforce@freebsd.org>; Fri,  3 Feb 2006 20:09:31 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 662D443D45
	for <perforce@freebsd.org>; Fri,  3 Feb 2006 20:09:31 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k13K9VYX029388
	for <perforce@freebsd.org>; Fri, 3 Feb 2006 20:09:31 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k13K9VPm029385
	for perforce@freebsd.org; Fri, 3 Feb 2006 20:09:31 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 3 Feb 2006 20:09:31 GMT
Message-Id: <200602032009.k13K9VPm029385@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 90994 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Feb 2006 20:09:32 -0000

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

Change 90994 by jhb@jhb_slimer on 2006/02/03 20:08:50

	Sabotage panic() into printf() in for rw_assert() and witness for now.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_rwlock.c#3 edit
.. //depot/projects/smpng/sys/kern/subr_witness.c#150 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_rwlock.c#3 (text+ko) ====

@@ -493,6 +493,9 @@
 #undef _rw_assert
 #endif
 
+/* XXX: no commit! */
+#define	panic	printf
+
 /*
  * In the non-WITNESS case, rw_assert() can only detect that at least
  * *some* thread owns an rlock, but it cannot guarantee that *this*

==== //depot/projects/smpng/sys/kern/subr_witness.c#150 (text+ko) ====

@@ -798,6 +798,9 @@
 	return (0);
 }
 
+/* XXX: no commit! */
+#define	panic	printf
+
 void
 witness_checkorder(struct lock_object *lock, int flags, const char *file,
     int line)
@@ -1245,6 +1248,7 @@
 		}
 	panic("lock (%s) %s not locked @ %s:%d", class->lc_name, lock->lo_name,
 	    file, line);
+	return;
 found:
 
 	/* First, check for shared/exclusive mismatches. */