From owner-p4-projects@FreeBSD.ORG  Fri Jun  2 16:30:39 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 271E516A4D9; Fri,  2 Jun 2006 16:30:39 +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 F365016A4D5
	for <perforce@freebsd.org>; Fri,  2 Jun 2006 16:30:38 +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 079CA43D6E
	for <perforce@freebsd.org>; Fri,  2 Jun 2006 16:30:37 +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 k52GT64u001513
	for <perforce@freebsd.org>; Fri, 2 Jun 2006 16:29:06 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k52GT6GQ001505
	for perforce@freebsd.org; Fri, 2 Jun 2006 16:29:06 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 2 Jun 2006 16:29:06 GMT
Message-Id: <200606021629.k52GT6GQ001505@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 98350 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: Fri, 02 Jun 2006 16:30:39 -0000

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

Change 98350 by jhb@jhb_mutex on 2006/06/02 16:28:19

	Move the taskqueue_enqueue() into clearentry().

Affected files ...

.. //depot/projects/smpng/sys/kern/subr_firmware.c#6 edit

Differences ...

==== //depot/projects/smpng/sys/kern/subr_firmware.c#6 (text+ko) ====

@@ -107,6 +107,7 @@
 	KASSERT(fp->refcnt == 0, ("image %s refcnt %u", fp->name, fp->refcnt));
 	if (keep_file && (fp->file != NULL))
 		fp->name = name_unload;
+		taskqueue_enqueue(taskqueue_thread, &firmware_task);
 	else {
 		fp->name = NULL;
 		fp->file = NULL;
@@ -240,8 +241,6 @@
 	fp->refcnt--;
 	if (fp->refcnt == 0 && (flags & FIRMWARE_UNLOAD))
 		clearentry(fp, 1);
-	if (fp->file)
-		taskqueue_enqueue(taskqueue_thread, &firmware_task);
 	mtx_unlock(&firmware_mtx);
 }