From owner-p4-projects  Thu Apr  4 11:37:17 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D48337B416; Thu,  4 Apr 2002 11:37:09 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 91D4637B41A
	for <perforce@freebsd.org>; Thu,  4 Apr 2002 11:37:08 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g34Jb8R28384
	for perforce@freebsd.org; Thu, 4 Apr 2002 11:37:08 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Date: Thu, 4 Apr 2002 11:37:08 -0800 (PST)
Message-Id: <200204041937.g34Jb8R28384@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 9044 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://people.freebsd.org/~peter/p4db/chv.cgi?CH=9044

Change 9044 by jhb@jhb_laptop on 2002/04/04 11:36:52

	Integ a few more mtx_init() fixups.

Affected files ...

... //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#4 integrate
... //depot/projects/smpng/sys/kern/kern_mutex.c#27 integrate
... //depot/projects/smpng/sys/kern/kern_proc.c#21 integrate

Differences ...

==== //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#4 (text+ko) ====

@@ -426,7 +426,8 @@
 {
     struct ifnet *ifp = &sc->sc_if;
 
-    mtx_init(&sc->mtx, device_get_nameunit(sc->dev), MTX_DEF | MTX_RECURSE);
+    mtx_init(&sc->mtx, device_get_nameunit(sc->dev), MTX_NETWORK_LOCK,
+	MTX_DEF | MTX_RECURSE);
 
     ifp->if_softc = sc;
     ifp->if_init = (if_init_f_t *)pdq_ifinit;

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

@@ -789,7 +789,7 @@
 {
 	struct mtx_args *margs = arg;
 
-	mtx_init(margs->ma_mtx, margs->ma_desc, margs->ma_opts);
+	mtx_init(margs->ma_mtx, margs->ma_desc, NULL, margs->ma_opts);
 }
 
 /*

==== //depot/projects/smpng/sys/kern/kern_proc.c#21 (text+ko) ====

@@ -96,7 +96,7 @@
 	sx_init(&allproc_lock, "allproc");
 	sx_init(&proctree_lock, "proctree");
 	sx_init(&pgrpsess_lock, "pgrpsess");
-	mtx_init(&pargs_ref_lock, "struct pargs.ref", MTX_DEF);
+	mtx_init(&pargs_ref_lock, "struct pargs.ref", NULL, MTX_DEF);
 	LIST_INIT(&allproc);
 	LIST_INIT(&zombproc);
 	pidhashtbl = hashinit(maxproc / 4, M_PROC, &pidhash);

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