From owner-p4-projects@FreeBSD.ORG  Thu Jun  3 13:13:46 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA18B16A4D0; Thu,  3 Jun 2004 13:13:46 -0700 (PDT)
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 8681516A4CE
	for <perforce@freebsd.org>; Thu,  3 Jun 2004 13:13:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7ADFA43D41
	for <perforce@freebsd.org>; Thu,  3 Jun 2004 13:13:46 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i53KDkBb015083
	for <perforce@freebsd.org>; Thu, 3 Jun 2004 13:13:46 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i53KDkol015080
	for perforce@freebsd.org; Thu, 3 Jun 2004 13:13:46 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Date: Thu, 3 Jun 2004 13:13:46 -0700 (PDT)
Message-Id: <200406032013.i53KDkol015080@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 54101 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 03 Jun 2004 20:13:47 -0000

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

Change 54101 by peter@peter_daintree on 2004/06/03 13:13:01

	IFC @54100

Affected files ...

.. //depot/projects/hammer/sys/kern/subr_witness.c#28 integrate

Differences ...

==== //depot/projects/hammer/sys/kern/subr_witness.c#28 (text+ko) ====

@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.172 2004/06/02 23:28:06 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.173 2004/06/03 20:07:44 jhb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_witness.h"
@@ -283,8 +283,8 @@
 	{ NULL, NULL },
 	/*
 	 * UNIX Domain Sockets
+	{ NULL, NULL },
 	 */
-	{ NULL, NULL },
 	/*
 	 * UDP/IP
 	 */
@@ -302,6 +302,7 @@
 	 */
 	{ "slip_mtx", &lock_class_mtx_sleep },
 	{ "slip sc_mtx", &lock_class_mtx_sleep },
+	{ NULL, NULL },
 	/*
 	 * spin locks
 	 */