From owner-p4-projects@FreeBSD.ORG  Thu Sep 18 17:25:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E1DAC1065673; Thu, 18 Sep 2008 17:24:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A623F106566C
	for <perforce@freebsd.org>; Thu, 18 Sep 2008 17:24:59 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 94C8C8FC0C
	for <perforce@freebsd.org>; Thu, 18 Sep 2008 17:24:59 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8IHOx2Q064067
	for <perforce@freebsd.org>; Thu, 18 Sep 2008 17:24:59 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8IHOxN7064065
	for perforce@freebsd.org; Thu, 18 Sep 2008 17:24:59 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 18 Sep 2008 17:24:59 GMT
Message-Id: <200809181724.m8IHOxN7064065@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 150029 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: Thu, 18 Sep 2008 17:25:00 -0000

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

Change 150029 by jhb@jhb_mutex on 2008/09/18 17:23:22

	Drop some local diffs.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_rwlock.c#24 edit
.. //depot/projects/smpng/sys/kern/subr_witness.c#171 edit

Differences ...

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

@@ -908,9 +908,6 @@
 #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#171 (text+ko) ====

@@ -1009,9 +1009,6 @@
 	return (0);
 }
 
-/* XXX: no commit! */
-#define	panic	printf
-
 void
 witness_checkorder(struct lock_object *lock, int flags, const char *file,
     int line, struct lock_object *interlock)
@@ -2164,7 +2161,6 @@
 	else {
 		panic("Lock (%s) %s is not sleep or spin!",
 		    class->lc_name, lock->lo_name);
-		return;
 	}
 	file = fixup_filename(file);
 	switch (flags) {