From owner-p4-projects@FreeBSD.ORG  Wed May 31 18:51:51 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 65B8716A496; Wed, 31 May 2006 18:51:51 +0000 (UTC)
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 34A4F16B917
	for <perforce@freebsd.org>; Wed, 31 May 2006 18:51:49 +0000 (UTC)
	(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 0037F43D48
	for <perforce@freebsd.org>; Wed, 31 May 2006 18:51:48 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4VIoQv7040688
	for <perforce@freebsd.org>; Wed, 31 May 2006 18:50:26 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4VIoP44040685
	for perforce@freebsd.org; Wed, 31 May 2006 18:50:25 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 31 May 2006 18:50:25 GMT
Message-Id: <200605311850.k4VIoP44040685@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 98223 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, 31 May 2006 18:51:53 -0000

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

Change 98223 by jhb@jhb_mutex on 2006/05/31 18:50:19

	Grab Giant around sysctl_{un,}register_oid() since sysctl still
	needs Giant.
	
	Submitted by:	csjp

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_linker.c#65 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_linker.c#65 (text+ko) ====

@@ -277,8 +277,10 @@
 	if (linker_file_lookup_set(lf, "sysctl_set", &start, &stop, NULL) != 0)
 		return;
 
+	mtx_lock(&Giant);
 	for (oidp = start; oidp < stop; oidp++)
 		sysctl_register_oid(*oidp);
+	mtx_unlock(&Giant);
 }
 
 static void
@@ -292,8 +294,10 @@
 	if (linker_file_lookup_set(lf, "sysctl_set", &start, &stop, NULL) != 0)
 		return;
 
+	mtx_lock(&Giant);
 	for (oidp = start; oidp < stop; oidp++)
 		sysctl_unregister_oid(*oidp);
+	mtx_unlock(&Giant);
 }
 
 static int