From owner-p4-projects@FreeBSD.ORG  Wed Sep 14 21:08:07 2005
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 9D95016A421; Wed, 14 Sep 2005 21:08:06 +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 78BB816A41F
	for <perforce@freebsd.org>; Wed, 14 Sep 2005 21:08:06 +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 4879443D46
	for <perforce@freebsd.org>; Wed, 14 Sep 2005 21:08:06 +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 j8EL867U098240
	for <perforce@freebsd.org>; Wed, 14 Sep 2005 21:08:06 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8EL85Rg098237
	for perforce@freebsd.org; Wed, 14 Sep 2005 21:08:06 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 14 Sep 2005 21:08:06 GMT
Message-Id: <200509142108.j8EL85Rg098237@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 83619 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: Wed, 14 Sep 2005 21:08:07 -0000

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

Change 83619 by jhb@jhb_slimer on 2005/09/14 21:07:52

	Uniquify these messages somewhat.

Affected files ...

.. //depot/projects/smpng/sys/kern/subr_witness.c#136 edit

Differences ...

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

@@ -919,7 +919,16 @@
 			/*
 			 * Ok, yell about it.
 			 */
-			printf("lock order reversal\n");
+			if (((lock->lo_flags & LO_SLEEPABLE) != 0 &&
+			    (lock1->li_lock->lo_flags & LO_SLEEPABLE) == 0))
+				printf(
+		"lock order reversal: (sleepable after non-sleepable)\n");
+			else if ((lock1->li_lock->lo_flags & LO_SLEEPABLE) == 0
+			    && lock == &Giant.mtx_object)
+				printf(
+		"lock order reversal: (Giant after non-sleepable)\n");
+			else
+				printf("lock order reversal:\n");
 			/*
 			 * Try to locate an earlier lock with
 			 * witness w in our list.