From owner-p4-projects@FreeBSD.ORG  Tue Mar 28 15:17:41 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 4A67416A423; Tue, 28 Mar 2006 15:17:41 +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 1009816A41F
	for <perforce@freebsd.org>; Tue, 28 Mar 2006 15:17:41 +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 9EBF043D48
	for <perforce@freebsd.org>; Tue, 28 Mar 2006 15:17:40 +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 k2SFHeJu033256
	for <perforce@freebsd.org>; Tue, 28 Mar 2006 15:17:40 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2SFHe92033253
	for perforce@freebsd.org; Tue, 28 Mar 2006 15:17:40 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 28 Mar 2006 15:17:40 GMT
Message-Id: <200603281517.k2SFHe92033253@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 94170 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: Tue, 28 Mar 2006 15:17:41 -0000

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

Change 94170 by jhb@jhb_twclab on 2006/03/28 15:17:18

	Don't do locking until we've stopped adding linker classes and
	fix the assertion to take that into account.

Affected files ...

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

Differences ...

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

@@ -63,7 +63,7 @@
 
 #define	KLD_LOCK()		do { sx_xlock(&kld_sx); mtx_lock(&Giant); } while (0)
 #define	KLD_UNLOCK()		do { mtx_unlock(&Giant); sx_xunlock(&kld_sx); } while (0)
-#define	KLD_LOCK_ASSERT()	sx_assert(&kld_sx, SX_XLOCKED)
+#define	KLD_LOCK_ASSERT()	do { if (linker_no_more_classes) sx_assert(&kld_sx, SX_XLOCKED); } while (0)
 
 /*
  * static char *linker_search_path(const char *name, struct mod_depend
@@ -1222,7 +1222,6 @@
 	modlist_t mod;
 	struct sysinit **si_start, **si_stop;
 
-	KLD_LOCK();
 	TAILQ_INIT(&loaded_files);
 	TAILQ_INIT(&depended_files);
 	TAILQ_INIT(&found_modules);
@@ -1399,7 +1398,6 @@
 		linker_file_register_sysctls(lf);
 		lf->flags |= LINKER_FILE_LINKED;
 	}
-	KLD_UNLOCK();
 	/* woohoo! we made it! */
 }